github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-04-03 10:52:57 +00:00
Code Issues Projects Releases Wiki Activity
9,408 Commits 119 Branches 274 Tags
v3.2
Commit Graph

6063 Commits

Author SHA1 Message Date
老广
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