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

2011 Commits (15a5dda9e0cdbe2ac618a6b2a09df8928f485c88)

Author SHA1 Message Date
ibuler 4caa704abe perf: 修改组件支持 2023-07-11 17:04:43 +08:00
ibuler 2b51a7590e perf: 修改 api mode 和 i18n 2023-07-11 11:28:09 +08:00
老广 b10623c970
Merge pull request #10879 from jumpserver/pr@dev@feat_chatgpt_support 
feat: 支持 chatgpt 资产
 2023-07-11 09:59:04 +08:00
ibuler 76af71bbbe perf: 修改 Platform 约束 2023-07-07 19:47:12 +08:00
fit2bot 9607ab5164
perf: 修改支持 AD (#10926) 
* stash

* perf: 修改支持 AD

* perf: 优化 default

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-07-07 16:15:32 +08:00
feng ee3cdcd9e4 fix: 有默认值 required 为false 2023-07-06 10:33:36 +08:00
feng 89492410aa fix: 推送账号 不填写home 推送失败 2023-07-06 10:33:36 +08:00
老广 66c60ef5be
Revert "perf: add xrdp rdp7 port 3390" 2023-07-04 17:35:58 +08:00
老广 7950718582
Merge pull request #10825 from jumpserver/pr@dev@perf_asset_node 
perf: 接口sql优化 /api/v1/assets/nodes/children/tree/
 2023-07-04 11:28:45 +08:00
ibuler 8dbe61100b perf: 优化协议，支持 port from addr 2023-07-04 10:29:27 +08:00
Eric 2f81196874 perf: 更新 rdp7 protocol 设置 2023-07-03 10:22:49 +08:00
Eric 6001175629 perf: add xrdp rdp7 port 3390 2023-07-03 10:14:39 +08:00
ibuler 41e39c9614 perf: 修改 chatgpt 协议 2023-06-30 18:33:18 +08:00
ibuler 19de79fadf feat: 支持 chatgpt 资产 2023-06-30 17:35:49 +08:00
fit2bot bbbd011cc2
perf: 修改 protocol setting (#10875) 
* feat: 新增账号配置

* perf: 修改 platform protocol define

* perf: 修改 account config

* perf: 修改协议设置

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-06-30 15:54:06 +08:00
fangfang.dong b3dce27309 perf: 接口sql优化 /api/v1/assets/nodes/children/tree/ 2023-06-27 10:24:47 +08:00
老广 bccf3a0340
Merge pull request #10819 from jumpserver/pr@dev@perf_asset_asset 
perf: 接口sql优化 /api/v1/assets/assets/
 2023-06-27 09:55:11 +08:00
nut 358b3a1891
Update asset.py 2023-06-26 23:51:59 +08:00
fangfang.dong d7d554daf5 perf: 接口sql优化 /api/v1/assets/assets/ 2023-06-25 18:08:59 +08:00
ibuler 270ed5e2f8 perf: 修改 logging 避免冲突 2023-06-21 17:49:16 +08:00
ibuler a2bbf11f9d perf: 添加 migrate debug msg 2023-06-21 11:01:21 +08:00
feng 9403b76333 fix: 修改 push_account_params 数据迁移逻辑，不在导入公共方法生成数据 2023-06-19 18:23:57 +08:00
ibuler 4d4644dddd fix: 修改原来 platform 为 device 时，导致的 asset 类型不对 2023-06-19 17:54:42 +08:00
老广 db12bc07e8
Merge pull request #10760 from jumpserver/pr@dev@perf_assets_domain 
perf: 接口 /api/v1/assets/domains/ sql优化
 2023-06-19 10:25:20 +08:00
fangfang.dong 39ba52e4de perf: 接口 /api/v1/assets/label/ sql优化 2023-06-18 20:26:19 +08:00
fangfang.dong a8ef405939 perf: 接口 /api/v1/assets/domains/ sql优化 2023-06-18 20:24:14 +08:00
ibuler da4337168f perf: 修复自定义资产详情没有 auto_config 的问题 2023-06-16 18:44:13 +08:00
ibuler f4b5a302a1 fix: 修复授权资产根据协议搜索重复的问题 2023-06-16 16:44:05 +08:00
ibuler 50b64f6cf5 perf: 修改 category 引起的 sql 查询过多 
pref: stash

perf: 添加装饰器

perf: 优化 category api
 2023-06-16 15:53:48 +08:00
feng ef4132d2c5 feat: 添加自动化任务rdp ping 2023-06-15 18:33:05 +08:00
老广 29ebdb03e7
Merge pull request #10711 from jumpserver/pr@dev@perf_json_field_select 
perf: 优化查询 acls
 2023-06-14 18:19:42 +08:00
ibuler 53c3c90e2d perf: 优化查询 acls 2023-06-14 18:17:20 +08:00
fit2bot 120f0dd3ad
perf: asset web autofill 添加LabeledChoiceField (#10706) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-14 14:42:53 +08:00
fit2bot 5bd4a882cc
fix: 平台导入无协议port (#10702) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-13 17:57:48 +08:00
Eric b79aaff4a0 perf: 资产根据 ssh 协议过滤是否启用 sftp 2023-06-12 15:42:24 +08:00
fit2bot a341b55f43
perf: 一些资产没有默认节点+ (#10622) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-05 15:10:33 +08:00
Bai ed117ceac3 perf: 优化创建节点时校验同级节点名称不允许重复(API方式) 2023-06-01 16:39:44 +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
ibuler d285daa1c1 perf: 资产支持根据协议搜索 2023-05-30 17:55:34 +08:00
ibuler f4c29a262a perf: 优化自动化任务在平台中的名称显示 2023-05-30 17:17:47 +08:00
fit2bot e61227d694
perf: 登录资产的 ACL 支持 ip 控制 (#10581) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-05-29 19:45:55 +08:00
halo a1ed59d116 perf: yaml文件读取使用utf-8编码 2023-05-29 11:16:29 +08:00
fit2bot 5e7d474bb7
perf: RemoteAppHost 平台支持 winrm (#10542) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-05-25 13:57:02 +08:00
ibuler eccbf46300 merge: with dev 2023-05-24 15:26:59 +08:00
Bai feb42961ef feat: 资产列表搜索支持 comment 模糊搜索 2023-05-22 18:27:07 +08:00
ibuler a261d69cd2 perf: 修改 m2m json field 2023-05-18 21:34:19 +08:00
fit2bot 44967b1af1
fix: 平台局部更新会自动关闭其他属性 (#10484) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-18 15:43:23 +08:00
jiangweidong cfc91047fd perf: 自动化任务执行错误日志在DEBUG_DEV下打印 2023-05-16 18:15:55 +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
老广 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
Bai 24fd87f7bc perf: 平台协议API返回public字段 2023-05-10 15:36:18 +08:00
feng 9802aec881 perf: 自动化执行详情数据 2023-05-10 15:24:40 +08:00
Bai 8309f00e5e fix: 修复资产类型树循环显示的问题 2023-05-10 02:53:19 +00:00
fit2bot 1933e82587
feat: 账号模版切换至 (#10396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-05-09 15:29:02 +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
fit2bot f842546042
perf: 平台导出过滤掉automation (#10367) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-28 17:13:43 +08:00
fit2bot 58d055f114
perf: 改密 推送 可以对自己操作 同时设置su_enabled 可提权 (#10349) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-26 18:50:30 +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
ibuler a105748a55 perf: 账号模版 protocols 过滤 2023-04-21 17:11:18 +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
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
fit2bot 10b033ee97
perf: 批量更新资产消息 (#10280) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-20 16:22:02 +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
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
ibuler 6b3665e8d0 perf: yaml 文件支持 i18n 2023-04-20 11:13:28 +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
fit2bot fc4a77df1a
fix: 账号导入500 (#10255) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:57:38 +08:00
ibuler a83d1c7c46 perf: 优化 applet host platform 2023-04-18 19:13:04 +08:00
ibuler 8b98bbddaa perf: custom fields 仅custom 类型资产支持 2023-04-18 17:07:01 +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
ibuler faff0cd20a perf: 优化创建内置 platform 2023-04-17 18:54:55 +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
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 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