github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,236 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

5991 Commits (b3b7575b0c9a975efa7e999c01af574378b84fda)

Author SHA1 Message Date
老广 1cbfd48e11
Merge pull request #9874 from jumpserver/pr@dev@fix_operatelog_hide_sth 
fix: 操作日志显示用户加密后的密文，及日期格式调整
 2023-03-08 14:06:12 +08:00
老广 c8c33c02ef
Merge pull request #9880 from jumpserver/pr@dev@perf_applet_certs 
fix: 修复自签证书下发布机部署失败
 2023-03-08 14:04:47 +08:00
老广 261ec60ab7
Merge pull request #9870 from jumpserver/pr@dev@fix_reconnecttoken 
feat: connection-token 添加重联兑换 API
 2023-03-08 14:04:01 +08:00
jiangweidong 72ca55c293 perf: 邮箱测试时，不填写'主题前缀'会报错 2023-03-08 13:49:38 +08:00
吴小白 7d6295775f perf: 还原国际化文本格式 2023-03-08 13:42:37 +08:00
吴小白 17ec105f69 perf: 修正错误 2023-03-08 13:40:55 +08:00
吴小白 366e20b165 fix: 修复自签证书下发布机部署失败 2023-03-08 13:27:03 +08:00
jiangweidong be669f7f05 fix: 操作日志显示用户加密后的密文，及日期格式调整 2023-03-08 11:21:15 +08:00
feng 8833b19d79 fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug 2023-03-08 10:58:37 +08:00
Bai 4c7bc105d7 feat: connection-token 添加重联兑换 API 2023-03-08 10:25:53 +08:00
老广 bb30fcd7fd
Merge pull request #9851 from jumpserver/pr@dev@fix_private_key 
fix: 修复 ed25519 私钥测试可连接性失败问题
 2023-03-07 11:29:10 +08:00
Eric eedc1ae8b5 fix: 修复类型问题 2023-03-02 19:05:27 +08:00
Eric b951ed9206 fix: 修复 account 私钥文件生成 2023-03-02 18:57:49 +08:00
Eric 03cc487fe6 fix: 修复 ed25519 私钥测试可连接性失败问题 2023-03-02 18:50:09 +08:00
feng 22f3caa954 fix: 修复i8n 500 2023-03-02 16:23:16 +08:00
Bai 891c478d13 fix: 修复 ldap 用户登录时邮箱存在 500 的问题 2023-03-02 16:22:55 +08:00
Bai 1901ef7252 fix: 修复 ldap 用户登录时邮箱存在 500 的问题 2023-03-02 15:58:32 +08:00
Aaron3S 6bc2f73f49 fix: 修复作业执行没有日志权限的问题 2023-03-01 18:37:27 +08:00
fit2bot 820971e2be
perf: k8s tree run (#9834) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-01 18:26:54 +08:00
Bai 27e1c17b26 fix: 资产类型树返回类型节点时, 没有platfrom设置isParent为False, 解决展开节点重复的问题 2023-03-01 17:28:39 +08:00
fit2bot d8d73700ea
perf: k8s tree update api (#9827) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-01 17:04:17 +08:00
ibuler ed967dcba9 perf: 优化翻译 2023-03-01 15:20:55 +08:00
Bai c39acc9a93 fix: 修改翻译 Core API & HelpText 2023-03-01 15:20:27 +08:00
Bai c37e2d3dc2 fix: 修改翻译 已有 RDS 许可证 2023-03-01 15:20:27 +08:00
fit2bot 797c7635a7
perf: asset hardwareinfo (#9813) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-28 18:45:38 +08:00
老广 410668c209
Merge pull request #9812 from jumpserver/pr@dev@perf_rd_license 
perf: 优化 RD License 配置
 2023-02-28 18:31:16 +08:00
吴小白 3cbd772c4e perf: 优化 RD License 配置 2023-02-28 18:00:08 +08:00
Bai bc2d4735c1 fix: 修改翻译 2023-02-28 17:59:04 +08:00
fit2bot dfa3f4b53b
perf: 推送账号 社区版定时任务关闭 (#9804) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-28 13:35:17 +08:00
ibuler 8c81e60a1e perf: 修改协议创建时一些默认值 2023-02-27 19:48:07 +08:00
fit2bot fccdb66530
perf: 今日活跃资产 (#9796) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-27 18:10:08 +08:00
Aaron3S 094ad85d39 fix: 默认增加普通用户作业中心权限 2023-02-27 17:27:45 +08:00
ibuler 32081ea6ec perf: 添加账号用户名的推荐 
perf: 修改账号推荐
 2023-02-27 15:19:59 +08:00
ibuler 8937447955 perf: 修改资产 address 长度，以支持 mb4 
perf: 修改长度
 2023-02-27 14:07:54 +08:00
ibuler 454a38f994 perf: 去掉没有 Name 的迁移 2023-02-27 14:02:30 +08:00
老广 972d6fb924
Merge pull request #9777 from jumpserver/pr@dev@perf_account_migrate2 
perf: 优化迁移 accounts
 2023-02-27 10:08:00 +08:00
ibuler d2b6bb5013 perf: 优化迁移 accounts 
perf: 优化账号迁移，同名的迁移到历史中
 2023-02-26 09:47:40 +08:00
老广 ec31b4de73
Merge pull request #9759 from jumpserver/pr@dev@fix_activity_save_error 
fix: 解决Activity保存因为参数出错问题
 2023-02-24 18:18:18 +08:00
fit2bot f1c568dfc0
perf: 修改host info 接口, 社区开放applet, 修改改密发邮件bug (#9757) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-24 18:08:22 +08:00
jiangweidong 824e4c9e81 fix: 解决Activity保存因为参数出错问题 2023-02-24 17:59:32 +08:00
Bai 6541cd9f5f fix: 修复 web gui 支持的数据库 2023-02-24 15:12:41 +08:00
ibuler 22a1d60e3f perf: 优化 msg 2023-02-24 14:46:43 +08:00
Bai 63ca4f8fab fix: 修复认证MFA失败次数清空问题 2023-02-24 14:44:13 +08:00
fit2bot a4a871ff2b
fix: 修复计算今日活跃资产过滤逻辑 (#9745) 
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-24 12:16:45 +08:00
Bai 1b2de703f4 fix: 修复获取授权资产详情时返回 spec_info 字段, 解决连接 Magnus 问题 2023-02-24 11:41:15 +08:00
ibuler 0f338a3b58 perf: 修复社区版可能引起的问题 2023-02-24 00:31:38 +08:00
Bai 05d40a5255 fix: 修复平台列表创建同名校验问题 2023-02-23 19:57:55 +08:00
Bai 9b852f8b35 fix: 修复角色列表排序问题 2023-02-23 19:40:01 +08:00
fit2bot b3851adfe7
perf: translate (#9730) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 19:35:10 +08:00
Jiangjie.Bai 0a374db606
fix: 修复文件导出 {"": True"} 问题 (#9729) 2023-02-23 19:14:58 +08:00
老广 54239c9d44
Merge pull request #9725 from jumpserver/ssh_tunnel_no_auth_error 
fix: 对于网关无法连接的，给出原因并停止此任务的后续步骤，不影响其他任务
 2023-02-23 19:09:40 +08:00
fit2bot 37f7f1b510
fix: 修改查看 celery 日志的权限位 (#9728) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 19:06:08 +08:00
fit2bot ab0a1421a0
perf: push_account_enabled (#9727) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 18:55:15 +08:00
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
jiangweidong 9c599fd1f4 fix: 更改label 2023-02-23 16:25:02 +08:00
jiangweidong 0a5766edd3 fix: 操作日志的国际化应该根据查询对象的语言决定 2023-02-23 16:20:43 +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
老广 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
Aaron3S 25bd5c71d1 fix: 增加无法读取的文件提示 2023-02-22 21:27:14 +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
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
Eric 8eaf3fa781 perf: 部分字段 label 显示问题 2023-02-22 16:48:49 +08:00
fit2bot 7ceb27301b
perf: automation task name validate (#9690) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 16:23:18 +08:00
jiangweidong 0dba222796 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_operatelog_root_org 2023-02-22 15:57:17 +08:00
jiangweidong b9c0b9084e fix: 操作日志显示全部组织问题 2023-02-22 15:57:10 +08:00
Aaron3S d9a11900a9 fix: 修复作业中心资产和用于没有过滤授权规则的问题 2023-02-22 15:36:25 +08:00
ibuler e5081fd6a9 merge: with dev 2023-02-22 15:17:44 +08:00
fit2bot 89c4635162
perf: change secrett 提示 (#9686) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 15:15:00 +08:00
ibuler 33f6c5b257 perf: 修改 探测 2023-02-22 15:13:51 +08:00
Bai 156ad665c3 fix: rbac perms 2023-02-22 14:54:13 +08:00
Eric 312fe69015 fix: 修复发布应用失败 2023-02-22 14:10:13 +08:00
老广 4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration 
perf: 修复用户平台内置的问题
 2023-02-22 13:17:14 +08:00
ibuler 6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
Eric_Lee bbd274b92f
Merge pull request #9681 from jumpserver/pr@dev@fix_host_select 
fix: 过滤离线的发布机
 2023-02-22 12:29:31 +08:00
Eric f407bfd7b2 fix: 过滤离线的发布机 2023-02-22 12:27:30 +08:00
jiangweidong fd146055f3 fix: 删除空行 2023-02-22 11:46:28 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
ibuler 0996b1fbf5 merge: with dev 2023-02-22 11:27:53 +08:00
ibuler b5321e497b perf: 修改账号去掉无用的 2023-02-22 11:25:33 +08:00
ibuler 0140d4349a perf: 修改 优化去掉版本号 2023-02-22 11:23:43 +08:00
老广 f103fa22c9
Merge pull request #9673 from jumpserver/pr@dev@fix_manual_update_account_can_ping_ok 
fix: 解决部分数据库在修改密码后仍能ping通的问题
 2023-02-22 11:21:58 +08:00
ibuler fae494d707 perf: 修改 acount 2023-02-22 11:20:57 +08:00
ibuler 4c233cfb69 perf: 优化 account，去掉版本好 2023-02-22 11:18:42 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 11:04:29 +08:00
fit2bot d7946ccb6f
perf: 账号 资产 列表任务 (#9676) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 22:57:31 +08:00
fit2bot 7f1cbc8336
fix: except 无法解压的文件包 (#9677) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 22:52:52 +08:00
fit2bot 1bb128526a
fix: 修复使用key 方式 ansible 不能连接的问题 (#9675) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 22:45:02 +08:00
Eric 8f5d280e31 fix: 未激活的发布机，将无法使用 2023-02-21 22:25:50 +08:00
jiangweidong 02619e5ed8 fix: 解决部分数据库在修改密码后仍能ping通的问题 2023-02-21 22:08:34 +08:00
Eric_Lee 5add329a30
Merge pull request #9672 from jumpserver/pr@dev@fix_su_from 
fix: 账号 su from 过滤未生效
 2023-02-21 21:12:20 +08:00
Eric 4200fa7ff8 fix: 账号 su from 过滤未生效 2023-02-21 21:09:28 +08:00
jiangweidong 9c851cbd68 perf: 解决冲突 2023-02-21 20:32:44 +08:00
jiangweidong def5989cdc perf: 支持数据库网域执行Task 2023-02-21 20:27:44 +08:00
Eric_Lee a11eac7c3a
Merge pull request #9660 from jumpserver/pr@dev@perf_applethost 
perf: 修改发布机选项默认值
 2023-02-21 20:14:08 +08:00
Eric_Lee 0d8e0bd1cc
Merge pull request #9666 from jumpserver/pr@dev@fix_rdp_download 
fix: rdp file download
 2023-02-21 20:13:36 +08:00
Eric_Lee 85dbdd648f
Merge pull request #9669 from jumpserver/pr@dev@fix_ftp_log 
fix: 修复 ftp 审计日志上传失败
 2023-02-21 20:13:08 +08:00
fit2bot 0bd674bb9c
perf: ansible enabled false (#9670) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 20:06:45 +08:00
Eric 31a3e3b177 fix: 修复 ftp 审计日志上传失败 2023-02-21 19:35:35 +08:00
fit2bot b41880d4f2
perf: 自动化name 唯一键 校验 (#9668) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 18:31:42 +08:00
fit2bot 266e7e0dd7
perf: change secret is_active (#9667) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 17:54:59 +08:00
Eric 3f9f3f3290 fix: rdp file download 2023-02-21 17:39:33 +08:00
老广 b5d814e9be
Merge pull request #9665 from jumpserver/pr@dev@fix_platform_internal 
perf: 修改 platform 内置创建
 2023-02-21 15:50:58 +08:00
ibuler 771ea17469 perf: 修改 platform 内置创建 2023-02-21 15:49:59 +08:00
fit2bot 4735565cb8
perf: inventory 为空 任务跳过 (#9664) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:33:15 +08:00
fit2bot e4d28f5f3e
fix: 修复 playbook 编辑器无法清空内容的bug (#9663) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 15:22:08 +08:00
fit2bot 1caca32a26
perf: merge asset migrate (#9662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:15:26 +08:00
Eric 64e929a220 perf: 修改发布机选项默认值 2023-02-21 14:20:03 +08:00
ibuler 3df411fd61 perf: 修改权限位 2023-02-21 13:47:47 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler df9e533b3c perf: 修改 rabc 2023-02-21 13:40:48 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
ibuler f4cc03434f perf: 修改 rbac asset nodes 2023-02-21 13:11:56 +08:00
ibuler e67a876513 perf: 优化账号任务 2023-02-21 13:00:04 +08:00
Eric_Lee f46b707f70
Merge pull request #9659 from jumpserver/pr@dev@fix_deployment 
fix: 修复应用发布状态
 2023-02-21 12:21:05 +08:00
Eric f5d086702a fix: 修复应用发布状态 2023-02-21 12:12:38 +08:00
jiangweidong b5347be4e3
perf: Navicat为xpack功能 (#9650) 
* perf: Navicat移动到xpack功能

* 优化

* fix: 去掉多余的import

* perf: 优化逻辑

* perf: 修改打印位置
 2023-02-21 11:37:30 +08:00
fit2bot c8e1660f7e
perf: windows not ssh automation (#9658) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 11:36:17 +08:00
ibuler b49b7125b2 perf: 修改收集用户中间 2023-02-21 08:34:31 +08:00
ibuler c9534bb9c4 perf: 优化账号推送 2023-02-20 23:50:33 +08:00
jiangweidong 296ce7a59f perf: 优化执行命令 2023-02-20 22:21:46 +08:00
jiangweidong 28e28b620b perf: 优化DBeaver连接数据库时，不显示cli-dos窗口 2023-02-20 22:10:59 +08:00
fit2bot ca22b08cde
perf: account update (#9656) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 20:22:26 +08:00
Bai 1888597451 fix: 修改slugfield校验问题 2023-02-20 20:15:47 +08:00
fit2bot 137d69a539
perf: ansible runner logs (#9655) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 20:14:06 +08:00
fit2bot b76ed67c9c
perf: 超时过期时间 解释 (#9653) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:21:32 +08:00
fit2bot 95eeeb4208
perf: 自动化脱敏 aix (#9652) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:12:57 +08:00
Bai 2adfbeaeb7 fix: 修复终端列表搜索问题 2023-02-20 18:42:56 +08:00
Aaron3S 958122847b fix: 作业日志搜索过滤问题 2023-02-20 18:00:58 +08:00
Eric e001003ed3 perf: 完善发布机的重复部署 2023-02-20 18:00:30 +08:00
ibuler 37c54e976f perf： 优化 tasks 2023-02-20 18:00:29 +08:00
Bai 8ab01931fb fix: 修复logger.error堆栈问题 2023-02-20 17:59:18 +08:00
Bai d246b9bb35 fix: 修复资产硬件信息收集失败的问题 2023-02-20 17:25:16 +08:00
fit2bot 995321cee9
perf: 工单详情跨组织 (#9644) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 16:48:52 +08:00
fit2bot 30e51e37be
fix: 修复华为 SMS 提示不友好 (#9643) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 16:46:28 +08:00
老广 17a77586f7
Merge pull request #9641 from jumpserver/pr@dev@perf_ansible_gateway 
fix: 修复 ansible 网关问题
 2023-02-20 16:22:39 +08:00
ibuler 9644d8b1bc fix: 修复 ansible 网关问题 2023-02-20 16:20:03 +08:00
fit2bot 614aa069b0
fix: 添加 str 方法, 修复操作日志不友好的问题 (#9640) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 16:05:35 +08:00
fit2bot d334b09fa6
fix: 修改playbook 创建的序列类 (#9639) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 15:50:43 +08:00
Bai 90813d7690 fix: 修改翻译 2023-02-20 15:24:43 +08:00
Bai c456782d9e fix: 修复 ticket session 监控用户没有权限的问题 2023-02-20 15:09:10 +08:00
ibuler ca6d71f442 perf: 优化 celery task context 2023-02-20 15:03:36 +08:00
老广 7c3b98cf3b
Merge pull request #9634 from jumpserver/pr@dev@perf_audit_log2 
pref: 优化 audit log
 2023-02-20 14:24:16 +08:00
老广 a25d9ffdf5
Merge pull request #9632 from jumpserver/pr@dev@perf_navicat_support_mongodb_ssl 
Feat: 支持navicat连接MongoDB SSL连接
 2023-02-20 14:15:26 +08:00
ibuler ce2c3d7ce2 pref: 优化 audit log 2023-02-20 14:13:22 +08:00
jiangweidong c2773351af Fix: 解决资产创建后系统执行Ping及Gather任务失败问题 2023-02-20 14:06:26 +08:00
jiangweidong 2e451574ee Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat_support_mongodb_ssl 2023-02-20 14:03:19 +08:00
jiangweidong 6cedb90f1b Feat: 支持navicat连接MongoDB SSL连接 2023-02-20 14:03:07 +08:00
老广 5058d8158d
Merge pull request #9631 from jumpserver/pr@dev@perf_ordering 
perf: 优化排序
 2023-02-20 13:41:30 +08:00
ibuler bb0bb4e764 perf: domain serializer 2023-02-20 13:40:42 +08:00
ibuler 4818e759bc perf: 优化 一些继承 2023-02-20 13:36:50 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
Bai ec582e37dc fix: 修复录像返回数据 system_user -> account 2023-02-20 11:21:05 +08:00
Bai 0888fb2318 fix: 修复账号模版密码API查看权限问题 2023-02-20 10:57:52 +08:00
jiangweidong 37f74d7d73 fix: 格式看起来好看 2023-02-19 20:27:25 +08:00
jiangweidong 7837a28200 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_platform_activity_err 2023-02-19 20:20:49 +08:00
jiangweidong 3e7eef2522 fix: 平台Activity列表500 2023-02-19 20:20:42 +08:00
老广 7ea9b4d429
Merge pull request #9625 from jumpserver/pr@dev@fix_clean_activity_with_operation 
fix: 解决跨组织资源的Activty在其他组织下404的问题
 2023-02-19 20:05:42 +08:00
jiangweidong 485454f9c6 fix: 解决JobLog表依赖顺序不对，导致从新迁移失败问题 2023-02-19 19:49:06 +08:00
jiangweidong 3334f79e84 fix: 解决跨组织资源的Activty在其他组织下404的问题 2023-02-19 19:17:12 +08:00
ibuler da017f2e78 perf: 修改 ldap task 位置 2023-02-19 17:57:48 +08:00
老广 ba366e64e7
Merge pull request #9623 from jumpserver/pr@dev@account_push 
perf: account push
 2023-02-19 16:03:13 +08:00
feng a4cb1690d6 perf: account push 2023-02-19 16:01:34 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
ibuler 83c844292c perf: 优化 task 参数是 uuid 可能导致的问题 2023-02-19 15:10:10 +08:00