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

9655 Commits (bbbd011cc21422cb0fdcda937e068a2ee8bd9c9f)

Author SHA1 Message Date
ibuler 4d4644dddd fix: 修改原来 platform 为 device 时，导致的 asset 类型不对 2023-06-19 17:54:42 +08:00
cui fliter 471411a1aa fix some typos 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-06-19 15:19:41 +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
老广 618ee0b2f9
Merge pull request #10761 from jumpserver/pr@dev@perf_assets_label 
perf: 接口 /api/v1/assets/label/ sql优化
 2023-06-19 10:24:52 +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
老广 09f7ddd28a
Merge pull request #10756 from jumpserver/pr@dev@fix_custom_asset_detail_error 
perf: 修复自定义资产详情没有 auto_config 的问题
 2023-06-16 18:48:24 +08:00
ibuler da4337168f perf: 修复自定义资产详情没有 auto_config 的问题 2023-06-16 18:44:13 +08:00
老广 f13966e061
Merge pull request #10754 from jumpserver/pr@dev@fix_permed_asset_duplicate 
fix: 修复授权资产根据协议搜索重复的问题
 2023-06-16 16:53:43 +08:00
ibuler f4b5a302a1 fix: 修复授权资产根据协议搜索重复的问题 2023-06-16 16:44:05 +08:00
老广 dd955530f1
Merge pull request #10746 from jumpserver/pr@dev@perf_category_api_sql 
perf: 修改 category 引起的 sql 查询过多
 2023-06-16 15:55:27 +08:00
ibuler 50b64f6cf5 perf: 修改 category 引起的 sql 查询过多 
pref: stash

perf: 添加装饰器

perf: 优化 category api
 2023-06-16 15:53:48 +08:00
老广 a5b21f94c2
Merge pull request #10752 from jumpserver/pr@dev@perf_custom_field_required 
perf: 优化自定义 platform field
 2023-06-16 15:16:58 +08:00
ibuler 9e3e183f95 perf: 优化自定义 platform field 2023-06-16 15:07:17 +08:00
ibuler 9ec3147b5f perf: 修改 login acls 迁移冲突问题 
perf: 修改 login acls 迁移，避免冲突
 2023-06-16 13:59:15 +08:00
老广 79fa134621
Merge pull request #10742 from jumpserver/pr@dev@windows_rdp_ping 
feat: 添加自动化任务rdp ping
 2023-06-15 18:34:45 +08:00
feng ef4132d2c5 feat: 添加自动化任务rdp ping 2023-06-15 18:33:05 +08:00
老广 b31a08ed8d
Merge pull request #10741 from jumpserver/pr@dev@fix_acl_migrate_not_work 
perf: 修复 acl 迁移后无法使用
 2023-06-15 18:32:34 +08:00
ibuler cdd47f4bc6 perf: 修复 acl 迁移后无法使用 2023-06-15 18:13:51 +08:00
ibuler 269a5e9d52 perf: 龙芯使用 buster 镜像 2023-06-15 17:39:21 +08:00
老广 dd0d1d3592
Merge pull request #10735 from jumpserver/pr@dev@change_docker_base_image 
perf: 修改基础镜像
 2023-06-15 16:59:58 +08:00
ibuler c06368d812 perf: 修改基础镜像 2023-06-15 16:53:28 +08:00
fit2bot 96ef56da67
perf: 修改翻译 (#10733) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-15 15:41:07 +08:00
老广 54926f7c70
Merge pull request #10729 from jumpserver/pr@dev@perf_custom_asset_support_required_field 
perf: 自定义 field 支持 required
 2023-06-15 13:18:06 +08:00
ibuler a48d0046a9 perf: 自定义 field 支持 required 2023-06-15 13:14:02 +08:00
fit2bot 852435c7d5
perf: user 序列化添加is_org_admin 字段 (#10728) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-15 12:15:04 +08:00
老广 b19d9c8754
Merge pull request #10727 from jumpserver/pr@dev@perf_acl_ordering 
perf: 优化 acl 默认排序
 2023-06-15 10:49:07 +08:00
ibuler e92c82568d perf: 优化 acl 默认排序 2023-06-15 10:45:07 +08:00
老广 c6e19a2989
Merge pull request #10726 from jumpserver/pr@dev@perf_json_field_re_error 
perf: 优化 json field re 报错问题
 2023-06-15 10:32:12 +08:00
ibuler 58edf02179 perf: 优化 json field re 报错问题 2023-06-15 10:27:52 +08:00
老广 3e9bafadec
Merge pull request #10725 from jumpserver/pr@dev@perf_json_attr_m2m_filter 
perf: 优化修改 rule vlaue
 2023-06-15 10:17:36 +08:00
ibuler 70af478f66 perf: 优化修改 rule vlaue 2023-06-15 10:16:18 +08:00
ibuler d7121296f2 perf: 优化使用 bool 2023-06-15 10:14:59 +08:00
老广 a76b243226
Merge pull request #10724 from jumpserver/pr@dev@fix_image 
fix: 修正基础镜像名称
 2023-06-15 10:14:03 +08:00
吴小白 5bd276b9ce fix: 修正基础镜像名称 2023-06-15 10:02:08 +08:00
老广 abd4e87bc2
Merge pull request #10723 from jumpserver/pr@dev@perf_json_attr_m2m_filter 
perf: 优化 json m2m filter
 2023-06-15 09:40:39 +08:00
ibuler 40d8a71bf8 perf: 优化 json m2m filter 2023-06-15 09:37:00 +08:00
老广 aad804f1af
Merge pull request #10722 from jumpserver/pr@dev@perf_json_filter_m2m 
perf: 优化 json m2m filter
 2023-06-14 21:11:41 +08:00
ibuler ee15f2d3d7 perf: 优化 json m2m filter 2023-06-14 21:10:35 +08:00
fit2bot 7c31b4ee30
perf: 修改翻译 (#10721) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-14 20:42:29 +08:00
ibuler 25e7249957 perf: 优化正则匹配 2023-06-14 20:41:14 +08:00
Aaron3S d10db0aa62 fix: 修复任务被黑名单拦截后没有更新状态的问题 2023-06-14 20:40:40 +08:00
老广 d87ece00bd
Merge pull request #10718 from jumpserver/pr@dev@perf_phone 
perf: 优化 phone
 2023-06-14 20:23:59 +08:00
ibuler fca3936a79 perf: 优化 phone 2023-06-14 20:22:41 +08:00
Aaron3S 2c2334b618 perf: 优化报错内容 2023-06-14 20:16:42 +08:00
Aaron3S 9e31a5064b perf: 优化黑名单命令提示 2023-06-14 20:16:42 +08:00
Bai 954f86f8a9 fix: 修复执行任务中心报错的问题 2023-06-14 19:57:55 +08:00
老广 a3d32c901d
Merge pull request #10715 from jumpserver/pr@dev@perf_filter_q_name 
perf: 优化 filter name
 2023-06-14 19:12:54 +08:00
ibuler ce5ddf7873 perf: 优化 filter name 2023-06-14 19:10:34 +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