github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,324 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

6773 Commits (27c505853baa901eb19583443754e281e5e32511)

Author SHA1 Message Date
Eric df8baede43 perf: 修复部分录像播放问题 2023-06-13 19:44:39 +08:00
fit2bot 5bd4a882cc
fix: 平台导入无协议port (#10702) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-13 17:57:48 +08:00
老广 370d944396
Merge pull request #10698 from jumpserver/pr@dev@perf_applethost_options 
perf: 修正发布机部署单用户单会话选项
 2023-06-13 15:56:01 +08:00
fit2bot c056cde2b7
perf: 修改翻译 (#10697) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-13 15:51:52 +08:00
Eric 93c0f11a5f perf: 修正发布机部署单用户单会话选项 2023-06-13 15:50:21 +08:00
老广 91ea738dcd
Merge pull request #10695 from jumpserver/pr@dev@perf_acl_account_migrate 
perf: 优化 acl 迁移中的 accounts
 2023-06-13 14:41:02 +08:00
ibuler 0d3478c728 perf: 优化 acl 迁移中的 accounts 2023-06-13 14:38:52 +08:00
老广 c271d3276a
Merge pull request #10693 from O-Jiangweidong/pr@dev@perf_ftp_log_field_same_as_session 
perf: 字段含义和Session model保持一致
 2023-06-13 13:59:59 +08:00
jiangweidong dfd1ececdb perf: 删除翻译信息 2023-06-13 13:58:27 +08:00
jiangweidong 4683ae8c09 perf: 修改迁移文件中的字段信息 2023-06-13 13:54:59 +08:00
老广 db3fca0409
Merge pull request #10694 from jumpserver/pr@dev@perf_acls_filter 
perf: 优化 json m2m field 正向查询
 2023-06-13 13:50:31 +08:00
ibuler 7e9d1fc945 perf: 优化 json m2m field 正向查询 2023-06-13 13:48:32 +08:00
jiangweidong af018ea262 perf: 字段含义和Session model保持一致 2023-06-13 13:18:50 +08:00
jiangweidong 71ccfe66ec fix: 解决migrate文件中迁移数据会触发信号导致字段不对应错误引发迁移失败问题 2023-06-13 13:14:38 +08:00
jiangweidong a991a6c56c perf: 优化变量名 2023-06-13 11:36:32 +08:00
jiangweidong 9a29cda210 fix: 提供给luna的录像地址不能为本地local地址，应该为url 2023-06-13 11:36:32 +08:00
老广 aee20a6c05
Merge pull request #10686 from jumpserver/pr@dev@perf_applet_import 
perf: 优化 applet 导入
 2023-06-13 10:04:02 +08:00
ibuler 4a2f7d21f6 perf: 优化登录 ticket 创建 2023-06-13 09:54:03 +08:00
ibuler 44d92b9dec perf: 修改 acl user review 2023-06-12 19:12:11 +08:00
ibuler 1e9310bf0c perf: 优化 applet 导入 2023-06-12 19:00:59 +08:00
ibuler e9125d1228 perf: 修改 chrome error 2023-06-12 18:35:27 +08:00
老广 c85df4cf42
Merge pull request #10685 from jumpserver/pr@dev@fix_command_filter_acls_error 
perf: 优化命令过滤 acl 获取
 2023-06-12 18:28:52 +08:00
ibuler 09a5b63240 perf: 修改 acl filter 2023-06-12 18:28:04 +08:00
ibuler f9bc7ec4aa perf: 优化命令过滤 acl 获取 2023-06-12 18:20:30 +08:00
fit2bot d59a293bb9
perf: 修改用户组添加全部用户api的权限位 (#10683) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-12 18:16:09 +08:00
ibuler cb2b8bb70b perf: 放行快捷键 ctrl-c-v 2023-06-12 16:37:12 +08:00
老广 86c81c42de
Merge pull request #10681 from jumpserver/pr@dev@perf_global_acl 
perf: 优化 manager 和 acl 的 组织
 2023-06-12 16:02:45 +08:00
ibuler 5c2b54ad3b perf: 优化 manager 和 acl 的 组织 2023-06-12 16:00:14 +08:00
Eric b79aaff4a0 perf: 资产根据 ssh 协议过滤是否启用 sftp 2023-06-12 15:42:24 +08:00
jiangweidong 3fd8e5755d fix: 修改变量 2023-06-12 15:41:25 +08:00
jiangweidong 3604ef4228 fix: 解决录像无法在线观看的问题 2023-06-12 15:41:25 +08:00
Bai 24272d3162 fix: 修复 Token API 获取命令过滤器失败的问题 2023-06-12 14:11:44 +08:00
ibuler a99d22708c perf: 修改 migrations 2023-06-12 14:10:37 +08:00
ibuler dc35a8c52b perf: 优化 acl 默认排序和manager 2023-06-12 14:10:37 +08:00
Bai b4008338c6 perf: 优化配置 2023-06-12 11:24:12 +08:00
ibuler 6058f1bdc0 perf: m2m json field 字段必填 2023-06-12 11:03:04 +08:00
老广 ba353271ad
Merge pull request #10667 from jumpserver/pr@dev@fix_login_regex_error 
perf: 修复 正则匹配的 bug
 2023-06-09 18:35:23 +08:00
ibuler adfc22ae85 perf: 修复 正则匹配的 bug 2023-06-09 18:32:56 +08:00
jiangweidong ef2ecb225a fix: 资产登录规则操作日志显示优化 2023-06-09 18:25:00 +08:00
ibuler 9574d03c12 fix: 修复连接方式选择 2023-06-09 18:22:35 +08:00
Bai 00d3caf80c perf: 删除不用代码 2023-06-09 18:22:04 +08:00
fit2bot 2333a29a56
perf: 优化数据库改密原子性 (#10663) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:52:54 +08:00
fit2bot b3c5674213
fix: 资产用模版创建账号无切换至 (#10662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:23:44 +08:00
ibuler a86378601a perf: 修改插件 2023-06-09 15:58:30 +08:00
ibuler 6a73cd6b77 perf: 添加 edition 字段 2023-06-09 15:40:41 +08:00
老广 8f8e781376
Merge pull request #10655 from jumpserver/pr@dev@fix_login_acl_uniq 
perf: 优化 LoginACL 迁移，避免 uniq error
 2023-06-08 18:35:23 +08:00
ibuler 998505e999 perf: 修改 acl 登录 2023-06-08 18:33:43 +08:00
ibuler 1c95b67154 perf: 优化 LoginACL 迁移，避免 uniq error 2023-06-08 18:19:32 +08:00
jiangweidong 2837dcf40e
feat: 支持文件上传下载备份 (#10438) 
* feat: 支持文件上传下载备份

* perf: 抽离replay和ftpfile存储代码

* perf: FTPLog增加session字段

* fix: 修改变量名
 2023-06-08 18:04:07 +08:00
ibuler 271ec1bfe0 perf: 优化刚才修改导致的 acls 过滤没有过滤组织 2023-06-08 18:03:49 +08:00
老广 d2f1309900
Merge pull request #10644 from jumpserver/pr@dev@perf_acls_connect_methods 
perf: 优化 connect method acls 和登录 acls
 2023-06-08 14:52:10 +08:00
fangfang.dong a6d586efb4 feat: 系统设置 - 短信服务 - 多平台配置测试手机号: 增加区号显示与修改功能 2023-06-08 11:01:55 +08:00
jiangweidong f0c0ba3653 fix: 解决lina不显示json格式参数，优化DictSerializer改为JSONSerialzer， 2023-06-08 10:26:33 +08:00
ibuler d6eb4bcbd2 perf: 优化 connect method acls 和登录 acls 2023-06-07 17:39:56 +08:00
fit2bot bfd77aa1b0
feat: automation windows pyrdp ping (#10602) 
* feat: automation windows pyrdp ping

* perf: add pyfreerdp deps

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Eric <xplzv@126.com>
 2023-06-07 17:28:35 +08:00
老广 cc57fcacce
Merge pull request #10621 from jumpserver/pr@dev@fix_static_js 
fix: 修复 jumpserver.js 文件中 rules_id_map_label 变量缺失引起的用户初次登录修改密码表单无法校验提示的错误
 2023-06-07 10:36:25 +08:00
Eric 7d3b60232c perf: 优化翻译 2023-06-06 19:13:22 +08:00
Eric 10996f573a perf: 翻译 i18n 信息 2023-06-06 19:13:22 +08:00
ibuler c6f92a462f perf: 连接时支持连接参数 2023-06-05 17:27:44 +08:00
fit2bot a341b55f43
perf: 一些资产没有默认节点+ (#10622) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-05 15:10:33 +08:00
fangfangdong 3c68b880a7 fix: 修复 jumpserver.js 文件中 rules_id_map_label 变量缺失引起的用户初次登录修改密码表单无法校验提示的错误 2023-06-05 15:00:25 +08:00
Eric 42c35b0271 perf: chrome 脚本增加 sleep 等待指令，单位秒 2023-06-02 16:14:49 +08:00
Eric 8d8f479da6 perf: dbeaver 支持使用网关连接数据库 2023-06-02 16:13:10 +08:00
fit2bot 9d8c1bb317
perf: 账号模版更新时, 优化同步更新账号逻辑 (#10611) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-02 10:56:00 +08:00
Bai ed117ceac3 perf: 优化创建节点时校验同级节点名称不允许重复(API方式) 2023-06-01 16:39:44 +08:00
fit2bot 1ac9d727ef
perf: 修改翻译 (#10604) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-31 18:19:11 +08:00
fangfangdong a0bb25e558 feat: 系统设置-安全设置 支持配置 作业中心命令黑名单 2023-05-31 17:43:05 +08:00
Bai 51d6090fdc perf: 优化支持账号列表搜索资产名称 2023-05-31 16:50:37 +08:00
ibuler d402de012b perf: 优化写法，避免重复 2023-05-31 16:48:50 +08:00
ibuler 2a183e34ac perf: 修改去掉 debug 2023-05-31 16:48:50 +08:00
ibuler 7d111b6efb perf: 优化自定义平台和 applet 导入 2023-05-31 16:48:50 +08:00
jiangweidong 51e5733f1c
fix: 具有超级工单权限的用户申请工单可以指定给某人 (#10596) 2023-05-31 10:20:37 +08:00
fit2bot 3626bf8df6
feat: 命令及录像存储可连接性定时检查 (#10594) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-30 18:45:51 +08:00
ibuler 312213f1c5 perf: 允许 web 同时打开 2023-05-30 18:43:04 +08:00
ibuler d285daa1c1 perf: 资产支持根据协议搜索 2023-05-30 17:55:34 +08:00
ibuler f4c29a262a perf: 优化自动化任务在平台中的名称显示 2023-05-30 17:17:47 +08:00
fangfangdong b98ccf8b3d style: 调整国际化文件中时间单位显示方式 2023-05-30 17:04:50 +08:00
火星小刘 89b42ce51b 企业微信扫描登录修改为新版接口，在PC登录企业微信客户端的情况下，不再需要手机扫码。 
企业微信官方api
https://developer.work.weixin.qq.com/document/path/98151
 2023-05-30 14:58:58 +08:00
ibuler 50d8389fff perf: 优化 chrome 插件 2023-05-30 10:59:16 +08:00
ibuler 7a39552bb2 merge: with dev 2023-05-30 09:47:59 +08:00
fit2bot e61227d694
perf: 登录资产的 ACL 支持 ip 控制 (#10581) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-05-29 19:45:55 +08:00
ibuler 0901b95ce0 perf: 优化授权中动作的说明 2023-05-29 18:23:26 +08:00
feng fd7e821f11 feat: 用户组绑定所有用户 2023-05-29 16:27:51 +08:00
Eric ac3415d95c perf: 完善远程应用 chrome 启动方式 2023-05-29 15:25:32 +08:00
Eric b0b174bb2a perf: connection token 的 account 增加 asset 属性 2023-05-29 15:14:31 +08:00
halo a1ed59d116 perf: yaml文件读取使用utf-8编码 2023-05-29 11:16:29 +08:00
Bai 7708812556 perf: 优化终端端点 Host 字段帮助 2023-05-26 17:20:50 +08:00
Bai 24a98eb747 perf: 优化短信设置的字段名称显示 2023-05-26 15:19:11 +08:00
老广 60fd5a2e91
Merge pull request #10556 from jumpserver/pr@dev@fix_chrome_path 
fix: 修正 Chrome 环境变量
 2023-05-25 19:19:45 +08:00
ibuler 9932e7eadd perf: 资产授权支持 delete 控制 2023-05-25 19:15:48 +08:00
fit2bot 73102fceb0
fix: 修复禁用平台的账号切换功能，历史创建的切换账号依然可以正常切换 (#10560) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-25 18:38:14 +08:00
Bai 5e177b6ce5 fix: 修复用户登录认证 MFA 输入错误时没有记录具体错误信息的问题 2023-05-25 18:26:04 +08:00
吴小白 38b121421f fix: 修正 Chrome 环境变量 2023-05-25 17:42:19 +08:00
fit2bot a6366a2dd4
perf: ldap 能多组织同步用户 (#10543) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-05-25 17:35:36 +08:00
ibuler fa21c83db3 perf: LDAP 测试 api 改为异步的 2023-05-25 16:54:22 +08:00
feng f20a4beef3 fix: 自定义平台无自动化任务 2023-05-25 16:53:56 +08:00
ibuler cc2e42c77a perf: chrome 添加插件 2023-05-25 14:20:05 +08:00
jiangweidong bcb4e04200 perf: 忽略自定义短信认证请求证书校验 2023-05-25 14:13:48 +08:00
jiangweidong 848ea0cf3c perf: 修改翻译 2023-05-25 14:13:48 +08:00
jiangweidong 20cc4ea320 perf: 支持自定义短信认证 2023-05-25 14:13:48 +08:00
fit2bot 5e7d474bb7
perf: RemoteAppHost 平台支持 winrm (#10542) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-05-25 13:57:02 +08:00
halo b72f8a7241 perf: 优化账号收集，使用正则处理结果 2023-05-25 13:40:25 +08:00
老广 35e9c21ec5
Merge pull request #10547 from jumpserver/pr@dev@perf_json_filter 
perf: 修改 filter_q
 2023-05-25 12:30:13 +08:00
ibuler dcd35310cd perf: 修改 filter_q 2023-05-25 11:42:39 +08:00
fit2bot 32a8e150da
perf: 删除全部用户错误提示 (#10546) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-25 11:38:20 +08:00
Bai cabdc3ad42 fix: 修复终端端点使用资产标签匹配机制时 500 的问题 2023-05-24 17:36:51 +08:00
fit2bot 653b996d84
perf: 账号推送支持设置推送账号的 home 目录 (#10541) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-24 17:35:14 +08:00
ibuler eccbf46300 merge: with dev 2023-05-24 15:26:59 +08:00
Eric 440cd13fcc perf: 同一个协作会话链接，限制同一用户仅可使用一次 2023-05-24 14:40:01 +08:00
feng 20c1f4a293 perf: 改密过程原子性优化 2023-05-24 14:31:27 +08:00
Bai feb42961ef feat: 资产列表搜索支持 comment 模糊搜索 2023-05-22 18:27:07 +08:00
jiangweidong 3eaed62186
验证账号可连接性(自定义ssh)使用的key值错误 (#10523) 2023-05-22 17:29:17 +08:00
jiangweidong a3f472137f perf: 优化命令过滤规则操作日志显示问题 2023-05-22 15:07:55 +08:00
feng d4bb501ef9 fix: 账号导入500 2023-05-22 14:13:55 +08:00
ibuler c4b25fbdbd fix: 修复 applet 账号选择问题 2023-05-19 17:01:29 +08:00
ibuler 197364d42d perf: 暂存一下 2023-05-19 11:30:50 +08:00
ibuler 6eb9986c75 perf: 修改过期默认值 2023-05-19 10:58:04 +08:00
老广 e40d65871b
Merge pull request #10501 from jingzhaoyang/dev 
fix: when request access_token is post method, http body has no json …
 2023-05-19 10:43:32 +08:00
老广 a236de1eff
Merge pull request #10489 from O-Jiangweidong/pr@dev@fix_mfa_bypass 
fix: 修复某待审核用户返回时，登录其他用户可绕开mfa的问题
 2023-05-19 10:41:19 +08:00
ibuler a261d69cd2 perf: 修改 m2m json field 2023-05-18 21:34:19 +08:00
景朝阳 efb31d6f37
fix: when request access_token is post method, http body has no json data 2023-05-18 20:40:41 +08:00
Jiangjie.Bai 4a56875bda
Merge pull request #10500 from jumpserver/dev 
v3.3.0
 2023-05-18 19:37:10 +08:00
Eric 48fca8f0f3 perf: 修复 rdp option 参数设置 2023-05-18 19:36:30 +08:00
Jiangjie.Bai 2f5d094abb
Merge pull request #10498 from jumpserver/dev 
v3.3.0
 2023-05-18 19:17:08 +08:00
Eric 31600ba66c perf: rdp 设置分辨率不生效问题 2023-05-18 19:13:57 +08:00
Eric a17fa5a518 perf: remoteapp rdp文件参数禁用复用连接 2023-05-18 19:09:12 +08:00
Bai 59d964d57a perf: 优化组织管理员不能更新系统管理员 2023-05-18 19:03:51 +08:00
fit2bot 2981bfffb1
fix: 给 view 增加 export 属性 (#10495) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 18:33:22 +08:00
fit2bot 0596b74fa1
fix: 账号创建ssh key 校验 (#10494) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 18:00:58 +08:00
ibuler ebaa8d2637 perf: 优化 json error 2023-05-18 17:31:40 +08:00
吴小白 b368b6aef4 perf: 优化发布机部署脚本 2023-05-18 16:31:55 +08:00
fit2bot 44967b1af1
fix: 平台局部更新会自动关闭其他属性 (#10484) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 15:43:23 +08:00
fit2bot 6c19fd4192
fix: 修复 luna 类型树数量计算不准确bug (#10492) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 15:42:30 +08:00
jiangweidong bb27be0924 fix: 修复某待审核用户返回时，登录其他用户可绕开mfa的问题 2023-05-18 14:45:17 +08:00
ibuler 4e5ab5a605 perf: 修改过滤的 q 2023-05-18 13:14:32 +08:00
fit2bot b0b14fe2e1
fix: openid 三方登录限制bug (#10480) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-17 19:05:28 +08:00
Aaron3S 36aa0d301b perf: 优化 ops 用户提示 2023-05-17 18:37:54 +08:00
Aaron3S 3fa80351e0 fix: 修复作业中心提示用户名排序每次不一样的问题 2023-05-17 18:37:54 +08:00
fit2bot 1fef273669
fix: 修复工单日期不能为null settings 文件没有权限bug (#10479) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-17 17:29:34 +08:00
Bai 04e95d378c perf: 优化账号列表-添加账号切换自用户字段必填的问题 2023-05-17 14:11:21 +08:00
fit2bot 9058a79c5c
fix: 修复三方用户登录登录限制提示错误问题 (#10475) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-17 11:11:39 +08:00
fit2bot a7fed21819
perf: 翻译 (#10472) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 18:35:48 +08:00
jiangweidong cfc91047fd perf: 自动化任务执行错误日志在DEBUG_DEV下打印 2023-05-16 18:15:55 +08:00
fit2bot 4ce2d991dd
perf: 收集mysql账号username 优化 (#10470) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 18:15:42 +08:00
Bai 449e7ce454 fix: 修复删除组织时组织根节点未被删除的问题 2023-05-16 16:37:47 +08:00
fit2bot 9cc9600a4c
fix: 批量添加账号su_from 错乱 (#10463) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 15:44:02 +08:00
Bai f7e0f533e0 perf: 优化安全设置登录限制帮助文案信息 2023-05-16 15:25:57 +08:00
fit2bot c7c3f711bf
perf: 优化发布机不显示task信息问题 (#10450) 
* perf: 优化发布机不显示task信息问题

* perf: 添加celery task execution api的task_name字段

---------

Co-authored-by: “huailei000” <2280131253@qq.com>
Co-authored-by: feng <1304903146@qq.com>
 2023-05-16 14:48:00 +08:00
fit2bot ec10ee3298
fix: 模版批量添加提示异常（core 代码bug） (#10455) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-15 18:58:06 +08:00
fit2bot 155c241ef7
fix: 修复账号模版更新时 添加密码密钥500 (#10454) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-15 18:47:39 +08:00
吴小白 89b75835a6 perf: 优化一些问题 2023-05-15 13:43:44 +08:00
ibuler 7c850a8a1e perf: 修改 json field query 2023-05-12 19:16:55 +08:00
feng 5b4979bdb1 perf: 修改仅允许已存在用户登录 判断的函数名 2023-05-12 18:13:11 +08:00
fit2bot 6afcf7bf42
perf: 第三方用户认证错误信息提示（尤其是第三方认证跳转的情况） (#10446) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-12 17:22:18 +08:00
jiangweidong afb49f4040 fix: oracle Ping 失败 2023-05-12 15:41:03 +08:00
huailei 1c7634b394
Merge pull request #10432 from jumpserver/pr@dev@perf_task_log 
perf: 优化task执行数据显示
 2023-05-11 17:22:52 +08:00
“huailei000” ff4f01fb56 perf: 优化task执行数据显示 2023-05-11 17:19:21 +08:00
老广 fd5f57d9b7
Merge pull request #10425 from jumpserver/pr@dev@perf_dbasset 
perf: 平台协议支持更改 public 字段
 2023-05-11 10:50:33 +08:00
fit2bot f06059837d
perf: 授权类型树 (#10390) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-11 10:15:40 +08:00
Bai b98aa377b6 perf: 数据库资产 默认数据库 是必填项 2023-05-10 16:47:03 +08:00
Bai 42abad75d9 perf: 平台协议支持更改 public 字段 2023-05-10 16:46:10 +08:00
Aaron3S ebb0e796ce feat: 作业中心根据当前选择的资产提示用户名 2023-05-10 15:41:17 +08:00
Bai 24fd87f7bc perf: 平台协议API返回public字段 2023-05-10 15:36:18 +08:00
“huailei000” 90cc2a2519 perf: 展示执行详情数据 2023-05-10 15:24:40 +08:00
feng 9802aec881 perf: 自动化执行详情数据 2023-05-10 15:24:40 +08:00
ibuler 737032418a perf: 优化写法 2023-05-10 11:10:21 +08:00
ibuler 2aa03d5b79 perf: connect token 允许复用 2023-05-10 11:10:21 +08:00
老广 926550bf26
Merge pull request #10416 from jumpserver/pr@dev@fix_categorytree1 
fix: 修复资产类型树循环显示的问题
 2023-05-10 11:07:39 +08:00
ibuler 240f700b92 perf: 修改账号生成 2023-05-10 11:04:33 +08:00
ibuler 4000986d1d perf: 优化选择账号 2023-05-10 11:04:33 +08:00
ibuler 0e98990e17 perf: 远程应用调度优先调度的上个主机，使用上个账号，并支持同名账号 2023-05-10 11:04:33 +08:00
Bai 8309f00e5e fix: 修复资产类型树循环显示的问题 2023-05-10 02:53:19 +00:00
Bai f0cc64c74e perf: 优化账号用户名字段提示信息（null 的情况） 2023-05-09 18:41:28 +08:00
Chenyang Shen 65ca953f5b
Merge pull request #10409 from jumpserver/pr@dev@perf_job_permission 
perf: 优化 job permission
 2023-05-09 17:25:36 +08:00
ibuler 873c019b58 perf: 修改 job list 2023-05-09 17:23:21 +08:00
ibuler b5599fd3a6 perf: 优化 job permission 2023-05-09 17:18:52 +08:00
fit2bot 1933e82587
feat: 账号模版切换至 (#10396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-09 15:29:02 +08:00
fit2bot 6b6900cfd4
perf: 导出account 列表需对文件进行加密 (#10366) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-08 17:02:55 +08:00
jiangweidong 185f33c3e0 perf: 企业微信、钉钉、飞书本地没有用户即创建 2023-05-08 16:58:39 +08:00
jiangweidong 3f1858a105 将配置改到类属性中 2023-05-08 16:58:39 +08:00
jiangweidong 1fef9a2cf0 perf: 去掉不用的导包 2023-05-08 16:58:39 +08:00
jiangweidong 38a9b90a8b fix: flash_message 带上返回值 2023-05-08 16:58:39 +08:00
jiangweidong b376491020 perf: 优化user_type默认值 2023-05-08 16:58:39 +08:00
jiangweidong 3367f65b02 perf: 优化逻辑，抽离callback_base类 2023-05-08 16:58:39 +08:00
jiangweidong 7a97496f70 perf: 变量名还原 2023-05-08 16:58:39 +08:00
jiangweidong bda748d547 feat: 支持钉钉、飞书、企业微信扫码登录无用户时自动创建用户 2023-05-08 16:58:39 +08:00
feng 7ff22cbc34 fix: /prometheus/metrics/ api 500 2023-05-08 14:47:56 +08:00
ibuler 1ec4cbdf38 perf: 优化 m2m json field 2023-05-08 14:09:44 +08:00
ibuler a112d3c99d perf: 修改 accounts 字段 2023-05-06 19:52:03 +08:00
Eric ee7f1f8f5e perf: 支持 mp4 录像文件上传和新增 video worker 类型 2023-05-06 14:01:25 +08:00
Bai 127f6730f6 perf: 优化迁移后的 Redis 数据库平台从 Redis6+ 修改为 Redis6 2023-05-04 17:31:45 +08:00
Bai 22b56d73b6 fix: 修复迁移应用时(组织下只有根节点，同步后的应用资产没有设置节点的问题) 2023-05-04 16:39:24 +08:00
Bai 9934456af4 fix: 修复迁移redis资产账号丢失的问题(系统用户用户名为空字符串) 2023-05-04 15:44:31 +08:00
Bai 3585ca2d49 perf: 优化文案: 清除离线会话 2023-05-04 10:33:16 +08:00
fit2bot f842546042
perf: 平台导出过滤掉automation (#10367) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-28 17:13:43 +08:00
ibuler 5a6e13721d perf: 优化 json m2m field 2023-04-27 18:05:16 +08:00
Eric a0151b8d44 fix: 修复旧 ssh 私钥，解析失败的问题 2023-04-27 17:50:16 +08:00
ibuler 90090a7fc7 perf: 添加 JSONManyToManyFieldSerializer 2023-04-27 14:13:40 +08:00
fit2bot ea1c94c6db
perf: 用户组织按照name 进行排序 (#10354) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-27 11:38:33 +08:00
ibuler 338ab5c634 perf: 优化 acl 2023-04-26 19:11:53 +08:00
fit2bot 58d055f114
perf: 改密 推送 可以对自己操作 同时设置su_enabled 可提权 (#10349) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-26 18:50:30 +08:00
Bai 9eec2909ed fix: 修改'账号备份列表-执行次数'未翻译为英文的问题 2023-04-26 17:11:28 +08:00
ibuler 632627db11 perf: 去掉 debug model 2023-04-25 16:25:00 +08:00
fit2bot a19586f8b8
perf: perm user asset add labels (#10339) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 14:48:09 +08:00
fit2bot 8fe5ab42e8
perf: 用户工作台资产显示更多字段 (#10338) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 14:36:01 +08:00
ibuler f51af9736b perf: rdp 支持 console 模式 2023-04-25 14:35:07 +08:00
ibuler 20b7b794d8 perf: 修改 m2m field 2023-04-25 14:00:19 +08:00
fit2bot 2a196743f5
perf: 组织更新刷新缓存 (#10333) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 11:27:58 +08:00
fit2bot 917620736b
feat: 修改模版账号密码 同步更新关联的账号 (#10328) 
* feat: 修改模版账号密码 同步更新关联的账号

* feat: 同步多个账号

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 10:28:19 +08:00
ibuler 19d29d6637 perf: remove debug msg 2023-04-24 19:04:47 +08:00
ibuler c824ae4478 perf: 修改 manager 2023-04-24 19:03:44 +08:00
ibuler 3cdb81cf4a perf: 搞定自定义 orm field 2023-04-24 19:00:31 +08:00
ibuler 378eee0402 pref: stash 2 2023-04-24 16:27:13 +08:00
ibuler c991a73632 v1 2023-04-23 16:15:27 +08:00
feng 149ca1afce perf: 开源 acl去除 review 2023-04-21 18:41:47 +08:00
fit2bot a1f65bccc5
feat: 只有系统管理员才能更新或删除系统管理员 (#10306) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-21 17:31:39 +08:00
ibuler a105748a55 perf: 账号模版 protocols 过滤 2023-04-21 17:11:18 +08:00
fit2bot f1ee454254
perf: user groups filter (#10300) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-21 15:35:56 +08:00
ibuler a6ab886968 perf: 优化自定义类型的冲突 2023-04-21 15:21:11 +08:00
feng f85daa088f perf: 创建资产 nodes 可为空 默认 default 2023-04-21 14:58:11 +08:00
fit2bot ede53d3b6b
perf: ssh key strategy translate (#10295) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-21 14:08:59 +08:00
ibuler eb9ac213d5 perf: 去掉 debug msg 2023-04-21 11:32:49 +08:00
ibuler 06052b85a2 perf: 优化支持 自定义 applet 
perf: 优化平台
 2023-04-21 11:31:10 +08:00
Jiangjie.Bai f2e7845d4b
Merge pull request #10286 from jumpserver/dev 
v3.2.0
 2023-04-20 18:33:59 +08:00
fit2bot d75b7c014e
perf: 更新模版暂不同步修改账号 (#10285) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 18:29:31 +08:00
Jiangjie.Bai b44e6c258f
Merge pull request #10284 from jumpserver/dev 
v3.2.0
 2023-04-20 18:23:12 +08:00
Bai 2ae951e6e6 fix: 修改翻译 2023-04-20 17:53:42 +08:00
fit2bot 10b033ee97
perf: 批量更新资产消息 (#10280) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 16:22:02 +08:00
ibuler 177d634d85 fix: 修复登录 acl 显示不对 2023-04-20 15:48:56 +08:00
feng ee122690ff perf: asset date_updated 2023-04-20 15:48:34 +08:00
ibuler dac708f952 perf: 优化 api doc 报错 2023-04-20 15:47:50 +08:00
老广 75724cbddb
Merge pull request #10272 from jumpserver/pr@dev@perf_asset_task_i18n 
perf: 优化资产任务的 i18n
 2023-04-20 14:45:24 +08:00
老广 4b5d9d3a76
Merge pull request #10273 from jumpserver/pr@dev@account_auto_i18n 
perf: account auto i18n
 2023-04-20 14:44:54 +08:00
fit2bot 0de6c41406
perf: update templat account (#10274) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 14:43:40 +08:00
ibuler b52f18aea6 perf: 修改 i18n 2023-04-20 14:39:31 +08:00
ibuler be58539df8 perf: 修改支持 i18n 2023-04-20 14:19:13 +08:00
feng f030638ba4 perf: account auto i18n 2023-04-20 14:10:39 +08:00
ibuler f496f7d635 perf: 优化资产任务的 i18n 2023-04-20 13:51:41 +08:00
老广 8e61dc8e02
Merge pull request #10267 from jumpserver/pr@dev@perf_yaml_support_i18n 
perf: yaml 文件支持 i18n
 2023-04-20 13:21:22 +08:00
fit2bot c9ee46c0fb
perf: windows 账号可连接性 ansible 刷新 (#10268) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 11:32:33 +08:00
ibuler f2d34de161 perf: 修改格式 2023-04-20 11:27:10 +08:00
fit2bot dc5f7a5c05
fix: 资产 克隆有切换至的账号400 (#10266) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 11:14:23 +08:00
ibuler 6b3665e8d0 perf: yaml 文件支持 i18n 2023-04-20 11:13:28 +08:00
fit2bot 11ad6ab273
fix: 修复作业中心未开启的acl生效的问题 (#10265) 
* fix: 修复作业中心未开启的acl生效的问题

* perf: 优化代码风格

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-04-20 10:33:53 +08:00
jiangweidong 2ba32f6971 perf: 优化自定义改密时需要在命令中包含ssh登录用户的密码问题 2023-04-20 09:52:13 +08:00
Bai 96eb87f935 feat: 服务启动时校验 migrations 文件是否有冲突(DEBUG_DEV) 2023-04-19 14:14:37 +08:00
fit2bot 3afab38c5f
perf: 资产平台排序 (#10258) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 13:21:57 +08:00
fit2bot 9dedce6264
perf: 翻译 (#10257) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 13:02:24 +08:00
ibuler 4849b2627a perf: 优化一下迁移 2023-04-19 11:13:29 +08:00
ibuler 12adf66f41 perf: 优化账号历史过滤 2023-04-19 11:13:29 +08:00
fit2bot fc4a77df1a
fix: 账号导入500 (#10255) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:57:38 +08:00
fit2bot 3bc8eda66a
perf: 更新模版关联更新账号 (#10250) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:18:13 +08:00
Bai d402780d00 feat: 服务启动时校验 migrations 文件是否有冲突(DEBUG_DEV) 2023-04-18 20:23:56 +08:00
fit2bot 28f08251b3
perf: 修复创建资产时，account 的校验 (#10247) 
* perf: 修复创建资产时，account 的校验

* perf: 优化一下提示

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-18 20:10:51 +08:00
Aaron3S ca898ed7b5 perf: 优化代码 2023-04-18 19:54:14 +08:00
Aaron3S 50421a1f89 fix: 修复作业中心选择收藏资产取不到资产的问题 2023-04-18 19:54:14 +08:00
ibuler a83d1c7c46 perf: 优化 applet host platform 2023-04-18 19:13:04 +08:00
ibuler 389f94d672 perf: 修改 assets serializer 支持 accounts template 2023-04-18 19:12:26 +08:00
fit2bot f47d0b1a40
perf: 工单发消息失败 (#10242) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 18:56:17 +08:00
fit2bot a28239f313
fix: 登录复核刷新后404 (#10240) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 18:07:54 +08:00
老广 996690fc02
Merge pull request #10235 from jumpserver/pr@dev@perf_asset_set_default_nodes 
perf: custom fields 仅custom 类型资产支持
 2023-04-18 17:18:53 +08:00
ibuler 8b98bbddaa perf: custom fields 仅custom 类型资产支持 2023-04-18 17:07:01 +08:00
fit2bot cf197f7efc
perf: 创建资产通过账号模版创建账号 (#10234) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 17:03:49 +08:00
ibuler 5921b2ee8f perf: 修改默认节点 2023-04-18 16:29:41 +08:00
老广 52891bfca3
Merge pull request #10232 from jumpserver/pr@dev@perf_platform_internal_create 
perf: 修改 platforms
 2023-04-18 16:06:36 +08:00
fit2bot 0856b0cbbe
fix: k8s 无密码账号登录 (#10233) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 15:31:47 +08:00
ibuler b30e9aedce perf: 优化内置平台创建 2023-04-18 15:06:22 +08:00
ibuler bacda8248b perf: 修改内置 platform 创建 2023-04-18 14:25:35 +08:00
ibuler ce38b2263c perf: 修改 platforms 2023-04-18 14:02:24 +08:00
fit2bot 810aff9597
perf: k8s 支持网关 (#10229) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-18 11:32:59 +08:00
jiangweidong cad88560bb perf: 修改OAuth2的access_token前缀格式 2023-04-18 10:29:29 +08:00
ibuler faff0cd20a perf: 优化创建内置 platform 2023-04-17 18:54:55 +08:00
fit2bot 5a34372ca5
perf: 批量创建账号 没解密 (#10226) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 17:46:10 +08:00
fit2bot cff4309b03
fix: export assets (#10224) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 15:42:46 +08:00
ibuler 024d344f7e perf: 去掉 _autmoation_id 2023-04-17 15:41:35 +08:00
ibuler 20e7efcd70 perf: 优化 platform automation 结构 2023-04-17 15:41:35 +08:00
fit2bot 2b00e6e3a1
fix: 修复资产列表 mini 时报错 (#10220) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-17 15:10:34 +08:00
fit2bot b3b7575b0c
fix: 批量更新资产账号 错误 secret (#10221) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 15:07:34 +08:00
Jiangjie.Bai 9109a5e6a2
Merge pull request #10213 from jumpserver/dev 
v3.2.0 rc2
 2023-04-14 18:33:00 +08:00
jiangweidong 690e01cb78
feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret) (#9947) 
* feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret)

* perf: 去掉无用的属性

* perf: 优化自定义改密逻辑

* feat: 支持ssh_key认证

* perf: 去掉无用注释

* perf: 优化

* perf: 优化逻辑

* perf: 优化标题

* perf: 去掉一些无用的函数

* perf: 优化helptext
 2023-04-14 18:31:09 +08:00
fit2bot f07e4e53ec
perf: 推送成功后 设置账号可连接性 (#10211) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-14 17:53:21 +08:00
fit2bot b1374c6aba
fix: 更新平台 ansible_enabled 未设置 (#10210) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-14 17:10:33 +08:00
fit2bot e0f077b054
fix: k8s api 500 (#10209) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-14 16:57:08 +08:00
feng 31653cab11 perf: 单独推送账号 2023-04-14 16:22:54 +08:00
feng 976daaa726 fix: 修复AllTypes to_tree_nodes 方法 2023-04-14 15:39:37 +08:00
feng b359b1059c fix: 修复所有ansible任务执行失败问题 2023-04-14 14:25:01 +08:00
ibuler 490611c560 perf: 修改 applet 2023-04-14 11:30:04 +08:00
Jiangjie.Bai 8a3a9c87a8
Merge pull request #10201 from jumpserver/dev 
v3.2.0 rc1
 2023-04-13 21:29:05 +08:00
feng 00fd546776 fix: 修复迁移文件冲突bug 2023-04-13 21:28:12 +08:00
Jiangjie.Bai 68351b1c39
Merge pull request #10196 from jumpserver/dev 
v3.2.0 rc1
 2023-04-13 19:21:05 +08:00
Bai 21da805e78 fix: fix conflicts 2023-04-13 19:20:18 +08:00
fit2bot 1eb8e40d3e
feat: 账号推送附加参数 (#10080) 
* feat: 账号推送附加参数

* perf: 通过节点 资产 过滤平台api

* perf: push automation params

* perf: 修改playbook

* perf: params serializer

* perf: 账号推送playbook 调整

* perf: Automation serializer add params field

* perf: params 非必填

* perf: 添加is_params 给前端判断

* perf: is_params bool

* perf: 修改push account ansible逻辑

* perf: 修改获取push_kwargs方法

* perf: platform migrate

* perf: 修改api

* perf: 单个推送

* perf: push account

* perf: 修改asset auto_config

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-04-13 19:02:04 +08:00
jiangweidong 8e81aee1fd perf: luna连接时不显示 WinRM 协议选项 2023-04-13 18:29:21 +08:00
jiangweidong e12b832992
perf: 关闭SFTP后，luna界面不显示相应选项 (#10186) 
* perf: 关闭SFTP后，luna界面不显示相应选项

* perf: 修改默认值

* perf: 增加资产协议冗余字段，减少关联查询

* perf: 修改

* perf: 优化

* perf: 精简

* perf: 删掉空格

* perf: 修改继承类
 2023-04-13 17:26:24 +08:00
fit2bot 1aadb760f4
perf: 优化命令长度限制到8m (#10193) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-04-13 15:47:16 +08:00
fit2bot 4654756966
fix: 修复账号克隆 500 (#10192) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-13 14:20:07 +08:00
Bai 4c7c8f482d fix: 修复执行批量命令时报错的问题 TypeError:set obiect is not subscriptable 2023-04-12 18:30:34 +08:00
fit2bot 30b89e5cc9
perf: 账号模版更新 (#10184) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-12 17:59:13 +08:00
jiangweidong a59f1895a3 perf: 当连接资产为网关时，connection_token不返回网域网关信息 2023-04-12 11:43:06 +08:00
ibuler 59b27822be perf: 添加迁移文件 2023-04-11 19:32:29 +08:00
ibuler 36813f64db perf: 修改 device platform 支持 su 2023-04-11 19:32:29 +08:00
jiangweidong 111296ecd2 fix: 手机号码校验逻辑问题 2023-04-10 18:00:39 +08:00
jiangweidong b7badc146a fix 2023-04-10 17:36:26 +08:00
jiangweidong 8ff1bae7e6 fix: 手机号可以为空及验证逻辑修改 2023-04-10 17:36:26 +08:00
Eric b58488a7e9 perf: connection token api 兼容处理 2023-04-10 16:43:31 +08:00
ibuler 907fcd7555 perf: 优化 custom info 2023-04-10 15:18:27 +08:00
Bai 616e636837 fix: 修复手机号字段问题 2023-04-10 14:36:22 +08:00
ibuler 34e846927b perf: 优化 connect token asset info 2023-04-10 13:47:38 +08:00
fit2bot 1248458451
perf: 优化支持 choices (#10151) 
* perf: 支持自定义类型资产

* perf: 改名前

* perf: 优化支持 choices

* perf: 优化自定义资产

* perf: 优化资产的详情

* perf: 修改完成自定义平台和资产

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-04-10 10:57:44 +08:00
wulabing cec176cc33 fix notifications.py 
fix ops.tasks.check_server_performance_period AttributeError: type object 'Status' has no attribute 'get_terminal_latest_stat'
 2023-04-10 10:35:16 +08:00
jiangweidong 7833433d5f feat: 手机号支持选择区号 2023-04-10 10:33:31 +08:00
halo ec2c8538d9 fix: 首次登录强制开启MFA页面bug 2023-04-07 10:19:49 +08:00
fit2bot e34fbce082
perf: patch account 400 (#10153) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-06 19:53:01 +08:00
fit2bot fb1978a40b
fix: terminal status (#10142) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-06 10:31:41 +08:00
fit2bot 47d0882090
perf: 用户添加密码 设置是否已存在 (#10138) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-04 18:02:58 +08:00
fit2bot 7c1e92c787
fix: 更新账号 跳过name检查 (#10136) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-04 16:04:44 +08:00
老广 9af2974bad
Merge pull request #10104 from O-Jiangweidong/pr@dev@feat_windows_winrm 
feat: Windows类型资产增加winrm协议
 2023-04-04 14:08:34 +08:00
吴小白 211963a098 fix: 修正 applet 部署失败 2023-04-04 12:32:54 +08:00
jiangweidong 187c1e3804 perf: 优化winrm协议网域连接支持ssh_key 2023-04-04 11:55:07 +08:00
Bai 55774dae02 fix: 修复Luna页面用户授权树搜索问题(同步加载方式) 2023-04-04 11:53:01 +08:00
Bai 00ec9b6d5a fix: 修复Luna页面用户授权树默认展开所有节点的问题(同步加载方式) 2023-04-04 11:31:38 +08:00
ibuler 2b8d0a64fb fix: 优化系统用户迁移 2023-04-04 10:31:57 +08:00
fit2bot 3c07667689
perf: 修改 account migrate (#10125) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 18:53:37 +08:00
Eric 9686c66874 perf: 会话分享记录字段翻译 2023-04-03 18:37:01 +08:00
fit2bot c5340b5adc
perf: 修改 account (#10088) 
* perf: 优化账号创建策略

* perf: 修改账号

* perf: 修改 account

* perf: 修改 account

* perf: 修改批量创建

* perf: 修改账号批量创建

* perf: 继续优化账号批量添加

* perf: 优化创建 accounts 的结果

* perf: 优化账号批量返回的格式

* perf: 优化账号

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-03 18:18:31 +08:00
fit2bot 4601bb9e58
perf: 优化mac客户端名字 (#10122) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 17:50:52 +08:00
Bai 34c9044d03 fix: 修复 LDAP 导入用户时指定其他组织，还会导入到 Default 组织的问题 2023-04-03 08:47:21 +00:00
fit2bot 90cbf653ac
perf: 优化luna tree title (#10118) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 16:47:14 +08:00
Eric_Lee 1c93d7f0a3
Merge pull request #10107 from jumpserver/pr@dev@perf_dockerfile 
perf: applet 使用 powershell 部署
 2023-04-03 15:58:47 +08:00
Eric d9ad5aee4a perf: 修改默认值和变量名 2023-04-03 15:39:15 +08:00
Eric 1fbaa85178 perf: 修改接口 2023-04-03 15:39:15 +08:00
Eric 789eb0cf36 feat: 协作分享增加读写控制 2023-04-03 15:39:15 +08:00
jiangweidong cbe384161a perf: 优化一个函数名 2023-04-03 10:17:00 +08:00
jiangweidong 6aaa20ba17 Perf: 优化 2023-04-03 09:57:40 +08:00
jiangweidong 4c5e47cb99 perf: 普通用户工单申请时，选择指定账号，提示无权限 2023-03-30 16:26:12 +08:00
jiangweidong cfe0206179 feat: winrm协议支持网域自动化 2023-03-30 14:58:20 +08:00
吴小白 caef6a5052 perf: applet 使用 powershell 部署 2023-03-30 12:09:03 +08:00
老广 0cd6667ede
Merge pull request #10079 from jumpserver/pr@dev@perf_super_switch 
perf: 支持 super 方式的切换用户
 2023-03-30 10:24:43 +08:00
jiangweidong bc186df8d5 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into pr@dev@feat_windows_winrm 2023-03-29 17:11:07 +08:00
jiangweidong cab72c6991 feat: Windows类型资产增加winrm协议 2023-03-29 17:10:58 +08:00
Eric 344451ba55 perf: navicat 移到企业版 2023-03-29 14:56:20 +08:00
feng 678df5bf3e perf: 补回get_terminal_latest_stat 方法 2023-03-29 14:03:35 +08:00
fit2bot 8d3319717e
perf: 开启安全模式后过滤root administrator (#10089) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-28 16:26:40 +08:00
fit2bot 23b13db9e2
perf: category order (#10087) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-28 15:04:24 +08:00
Bai 3fa1b46312 fix: 修复授权规则Util类 2023-03-28 11:39:19 +08:00
jiangweidong 5b87470b5c perf: 优化账号活动日志界面的提示及操作日志的字段内容 2023-03-27 18:23:55 +08:00
Eric 118d33fa02 perf: 支持 super 方式的切换用户 2023-03-27 18:06:30 +08:00
Aaron3S 017682b383 perf: 增加我的资产通过 node_id 过滤我的资产 2023-03-27 14:53:39 +08:00
feng 1ac2fec13f feat: 收集账号 可选同步表 2023-03-27 14:13:44 +08:00
Bai 66d368f882 fix: 修改nodes_display required = False 2023-03-24 17:11:03 +08:00
Bai 30ab6836ab fix: 修改 login_button 2023-03-24 17:09:07 +08:00
fit2bot 55e1ef116b
perf: clear secret (#10053) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 16:04:09 +08:00
Bai 5d022c7056 fix: 修复资产导入支持填写节点路径 2023-03-23 16:01:19 +08:00
fit2bot f6c5c35a2c
feat: 账号收集批量同步账号 (#10051) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 15:24:19 +08:00
fit2bot 166d074adb
perf: 修改 port (#10049) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-23 14:13:08 +08:00
fit2bot 3b45ad0c61
feat: account remove secret (#10045) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 11:20:48 +08:00
老广 4b8fd64c5d
Merge pull request #10041 from jumpserver/pr@dev@feat_k8s_support_gateway 
feat: k8s 支持 gateway
 2023-03-22 19:43:54 +08:00
ibuler e3bd698baf feat: k8s 支持 gateway 2023-03-22 19:42:51 +08:00
fit2bot 0be3cb3c27
fix: account update (#10039) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 19:14:43 +08:00
fit2bot f7ae23f7d9
perf: 导入资产账号模版api优化 (#10038) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-03-22 18:35:23 +08:00
ibuler 1e0a6b5072 perf: 优化一下 2023-03-22 17:17:49 +08:00
ibuler c6071740b1 perf: 硬件设备支持账号切换 2023-03-22 16:43:00 +08:00
老广 463d54a4d8
Merge pull request #10023 from jumpserver/pr@dev@asset_accounts_secret_type_default 
perf: 设置资产账号的默认值，方便导入
 2023-03-22 15:38:26 +08:00
老广 8289e4c2c8
Merge pull request #10032 from jumpserver/pr@dev@platform_set_protocols 
perf: 修改 platform protocols
 2023-03-22 15:38:01 +08:00
ibuler aca0d62feb perf: 优化 protocols 2023-03-22 15:28:05 +08:00
ibuler 59d9572d07 perf: 优化 protocol 选择 2023-03-22 15:26:23 +08:00
ibuler ba076f6612 perf: 优化提示 2023-03-22 14:56:20 +08:00
fit2bot 43d805d0ca
perf: 配置CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED 对改密的特权账号过滤 (#10033) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 14:48:05 +08:00
ibuler 180ded1773 perf: 修改 platform protocols 2023-03-22 14:15:25 +08:00
fit2bot 81b04c449a
fix: tanslate (#10031) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 13:47:12 +08:00
fit2bot ed4a4ceca1
perf: 批量创建账号 定义创建账号策略 忽略或抛出错误 (#10028) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 11:09:48 +08:00
ibuler cac59db1ec perf: 设置资产账号的默认值，方便导入 2023-03-21 12:43:54 +08:00
fit2bot 9413fd4cd1
perf: 支持 iframe 标签选择 (#9908) 
* perf: 支持 iframe 标签选择

* perf: 完善 iframe 的选择语法

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-03-20 17:26:47 +08:00
jiangweidong bac296f82e
Merge pull request #10015 from O-Jiangweidong/pr@dev@perf_dbeaver_no_upgrade_no_download 
perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框
 2023-03-20 16:01:37 +08:00
fit2bot 69cd7bce17
perf: 批量创建账号时，跳过unique检查 不去创建 (#9966) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-20 15:45:21 +08:00
ibuler 44b6fd8771 fix: 去掉 warning 2023-03-20 10:05:29 +08:00
jiangweidong b6ccc53a71 perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框 2023-03-20 10:02:50 +08:00
ibuler 209f0d72b4 perf: 去掉 warning 2023-03-20 10:01:42 +08:00
ibuler eac4b41783 perf: 优化 warning 2023-03-20 09:59:34 +08:00
老广 7a35309e88
Merge pull request #10009 from WeiZhixiong/dev 
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "=="
 2023-03-20 09:51:40 +08:00
fit2bot 39e618c127
perf: 资产批量更新平台 (#10013) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-19 23:55:16 +08:00
WeiZhixiong 8e33c6f422
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "==" 2023-03-18 23:19:51 +08:00
ibuler f5523aaf7b perf: 优化导入导出 2023-03-17 10:45:45 +00:00
ibuler 12db64ea18 perf: 优化导入导出 2023-03-17 18:44:21 +08:00
fit2bot 1acfdf0398
perf: 批量推送账号 分批处理 (#10000) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-17 17:10:10 +08:00
ibuler c094bce71e perf: 优化 ansible 写法 2023-03-17 16:57:40 +08:00
ibuler cad6fffd74 perf: 优化 Ansible 账号选择 2023-03-16 19:09:29 +08:00
Bai 0747cf7c5e fix: 修复导出账号历史翻译信息 2023-03-16 16:40:53 +08:00
Bai 11675dc850 fix: 修复日志记录到syslog时中文编码问题 2023-03-16 16:40:53 +08:00
Bai 93a7cee4de fix: 修复导出账号历史翻译信息 2023-03-16 11:18:41 +08:00
Bai 41edeb9027 fix: 修复日志记录到syslog时中文编码问题 2023-03-15 19:46:01 +08:00
ibuler 891d9d36b0 fix: windows 平台默认不开启 console 2023-03-15 19:01:18 +08:00
fit2bot ebdd67d0f4
perf: endpoint rules list (#9975) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-15 18:24:39 +08:00
老广 09eebd7486
Merge pull request #9970 from jumpserver/pr@dev@perf_platform_change 
perf: 优化资产平台的获取
 2023-03-15 17:37:12 +08:00
Bai 894955dd68 fix: 修复更新授权报错的问题 2023-03-15 16:33:38 +08:00
halo 0ade034391 fix: 修复celery api 报错 2023-03-15 15:37:15 +08:00
jiangweidong 07eebd93fb
perf: 测试资产可连接性选择账号策略优化 (#9954) 2023-03-15 15:16:27 +08:00
Bai ffe9dd1f95 fix: 优化账号模版可以根据 protocols 过滤 secret_type 字段 2023-03-15 14:48:14 +08:00
ibuler 2b7f90349c perf: 优化资产平台的获取 2023-03-15 14:14:48 +08:00
Bai 48b937d867 fix: 修复手动登录用户失败的问题 2023-03-15 11:36:51 +08:00
Aaron3S df249a0355 perf: 优化 playbook 删除策略,正在被 job 使用时无法被删除 2023-03-14 20:02:23 +08:00
fit2bot 2ce293bd81
fix: push ssh key account bug (#9948) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 17:15:04 +08:00
老广 bff97929b5
Merge pull request #9942 from jumpserver/pr@dev@perf_csv_loads_error 
perf: 优化 csv parse
 2023-03-14 16:35:37 +08:00
Bai 0053d469f9 fix: 修复用户导入模版中没有 password_strategy 字段问题 2023-03-14 16:31:57 +08:00
ibuler 4c24e95b47 perf: 优化 csv parse 2023-03-14 14:12:42 +08:00
fit2bot c4945b3563
perf: 优化ansible 选择账号 (#9940) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 11:40:25 +08:00
ibuler 082af029a7 perf: 优化资产迁移，避免冲突 2023-03-14 11:21:52 +08:00
Bai 44d7165674 perf: 优化一些翻译信息，label 中带单位 2023-03-14 11:19:41 +08:00
fit2bot d4102ceb7a
perf: push select account (#9932) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 19:35:12 +08:00
老广 4a3196e193
Merge pull request #9931 from jumpserver/pr@dev@fix_excel_import_export 
perf: 优化 csv import export
 2023-03-13 18:07:57 +08:00
ibuler 16a7ccc95e perf: 优化文案 2023-03-13 18:06:54 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
fit2bot ed70432016
fix: 账号模版创建带密码的密钥之后无法添加到主机 (#9927) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 15:46:17 +08:00
halo 9f98e3f098 fix: 远程应用特权用户不生效问题 2023-03-12 21:27:30 +08:00
ibuler 2ffb9a5aa3 perf: 修改 Import export 2023-03-10 19:23:49 +08:00
ibuler fa3bfceddc perf: 优化导入导出 
perf: remove debug

perf: 修改账号导入导出

perf: 去掉一些 debug
 2023-03-10 19:23:49 +08:00
fit2bot 3658ecce0c
perf: 修改 ssh key with pass 报错 (#9917) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-10 16:04:48 +08:00
Bai aeb2e47880 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 9be01b4c67 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 83296be11f fix: ignore 2023-03-09 18:12:56 +08:00
Bai 266f5e9350 fix: 修复存在无效 es 时获取终端配置失败的问题 2023-03-09 17:12:05 +08:00
fit2bot dfbe8c0bc4
fix: 创建资产 可连接性为更新 (#9905) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-09 13:59:44 +08:00
jiangweidong 3de2992238 fix: 有可能保存明文密码 2023-03-09 13:02:34 +08:00
Eric fde92a28bd fix: 修复存储故障造成的录像获取失败问题 2023-03-09 11:51:00 +08:00
吴小白 2662ead1c4 perf: 正确配置 Ansible 证书校验 2023-03-09 11:19:24 +08:00
Bai 3f5af27a4e perf: 优化设置 MFA 文案(禁用=>重置) 2023-03-08 19:13:17 +08:00
fit2bot c90a2df28e
perf: automation account username change id (#9867) 
* perf: automation account username change id

* perf: 授权账号模版 自推送

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-03-08 18:52:00 +08:00
老广 8a0bd3379c
Merge pull request #9889 from jumpserver/pr@dev@perf_ignore_ssl 
perf: tinkerd 部署增加 ignore-verify-certs 配置
 2023-03-08 16:34:34 +08:00
Eric 177150c5cc perf: tinkerd 部署增加 ignore-verify-certs 配置 2023-03-08 16:16:10 +08:00
Bai bbddf6a342 fix: 修复组织管理员查看活动日志详情时没有对象的问题 2023-03-08 15:57:43 +08:00
Bai 6bbe602ebb fix: 修复组织管理员查看操作日志可以看到 system 组织下的操作问题, 只有系统管理员可以查看任务监控 2023-03-08 15:22:49 +08:00
老广 21352a2ab7
Merge pull request #9871 from jumpserver/pr@dev@fix_su_from_accounts 
fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug
 2023-03-08 14:06:59 +08:00
老广 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