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

7591 Commits (e06f9a03d61eb2a190a3990ca1155ae361313db0)

Author SHA1 Message Date
fit2bot cdf1f81c8a
perf: account automation translate (#13240) 
Co-authored-by: feng <1304903146@qq.com>
 2024-05-16 19:12:24 +08:00
Eric 79edff5fca perf: 支持 loki log 2024-05-16 19:00:47 +08:00
fit2bot a7316bc7c1
perf: translate (#13228) 
Co-authored-by: feng <1304903146@qq.com>
 2024-05-15 18:43:31 +08:00
jiangweidong 09f802b00d
perf: cloud sync module adjustment (#13197) 
* perf: cloud sync module adjustment

* perf: cloud sync module adjustment
 2024-05-14 10:36:17 +08:00
wangruidong a644b84bb1 perf: dashboard zh,ja,zh_hant i18n 2024-05-13 18:31:54 +08:00
wangruidong 3a6e4e7fb6 perf: file transfer boot step help tips i18n 2024-05-13 18:18:27 +08:00
wangruidong e42a98ff95 perf: celery task log css optimize 2024-05-13 18:16:36 +08:00
ibuler 8fe511cec6 perf: remove *.mo 2024-05-13 17:35:00 +08:00
Bai ffb3cd13cb perf: Delete locale dir 2024-05-13 17:26:38 +08:00
Bai b1abf8a339 perf: Merge local v4 2024-05-13 15:58:59 +08:00
ibuler 89d20c8a4d perf: 修改一些翻译 2024-05-13 15:28:11 +08:00
ibuler d66f923c0c perf: 修改翻译 2024-05-13 10:40:08 +08:00
ibuler d3c14428a1 perf: remove an or a 2024-05-13 10:35:21 +08:00
ibuler c104f85b18 perf: 修改翻译 2024-05-13 10:29:26 +08:00
fit2bot 755d8124ac
perf: account backup translate (#13198) 
Co-authored-by: feng <1304903146@qq.com>
 2024-05-11 19:48:15 +08:00
Bai a029cc8ed5 perf: i18n Personal Settings -> All sub menu 2024-05-11 18:55:03 +08:00
ibuler 111dfa8c29 perf: 修改大小写 2024-05-11 16:03:40 +08:00
ibuler 5f892c3afe perf: change i18n 2024-05-11 14:41:58 +08:00
fit2bot 313202fe41
perf: 合并 migrations (#13187) 
* perf: 修改 Migrations

* perf: 合并 migrations

* perf: remove unuse

* perf: change to file

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-05-11 11:22:01 +08:00
Bai af1adc3baa perf: i18n Personal Settings -> All sub menu 2024-05-11 11:17:02 +08:00
ibuler be214c84d1 merge: with dev 2024-05-10 18:10:18 +08:00
fit2bot 082614e7b0
perf: A wave of migration Japan, Taiwan China font (#13188) 
Co-authored-by: feng <1304903146@qq.com>
 2024-05-10 15:13:40 +08:00
wangruidong 83835747c5 perf: i18n 2024-05-10 10:06:44 +08:00
Bai 2a7b48c83d perf: i18n Personal Settings -> Profile 2024-05-09 15:26:38 +08:00
ibuler a9068496d9 perf: 打算压缩 migratons 2024-05-09 11:01:01 +08:00
fit2bot 8bad88e798
perf: 优化账号相关翻译 (#13177) 
Co-authored-by: feng <1304903146@qq.com>
 2024-05-08 18:04:46 +08:00
ibuler 259204bfe2 Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-04-30 10:42:31 +08:00
wangruidong c55e9679db perf: dashboard i18n 2024-04-30 10:31:22 +08:00
ibuler c05a3c315a Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-04-29 15:07:25 +08:00
ibuler dbdf586f5b add i18n 2024-04-29 15:06:53 +08:00
Bai 328f718fe8 merge: into dev from v4: i18n file 2024-04-29 11:16:09 +08:00
Bai cb4402c610 merge: into dev from v4 2024-04-29 11:07:43 +08:00
feng626 fbc4cb9046
Revert "perf: remove ticket model" (#13145) 
This reverts commit 94567b86f0.
 2024-04-28 18:26:49 +08:00
feng 94567b86f0 perf: remove ticket model 2024-04-28 18:02:57 +08:00
Bai 38175d6b57 fix: Fixed csv file export for `0` chars is not appear 2024-04-28 17:56:45 +08:00
ibuler 8aa707427f pref: remove user source choice 2024-04-28 16:01:09 +08:00
wangruidong 7408ed0f03 perf: add XPACKModelFieldsMixin 2024-04-28 15:58:14 +08:00
wangruidong 5135186961 perf: 社区版去掉一些东西 2024-04-28 15:58:14 +08:00
wangruidong 5be399616b fix: 华为交换机执行某些命令报错 2024-04-28 14:17:38 +08:00
ibuler 7d64b8419f Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-04-28 14:04:55 +08:00
ibuler fad9249810 perf: 再次修改菜单 2024-04-28 14:04:28 +08:00
wangruidong 46a23afbec perf: 创建、更新用户时MFA选项根据系统设置选项进行动态渲染 2024-04-26 11:35:56 +08:00
Bai 8c4add241d perf: Support django shell run orm output SQL 2024-04-26 10:39:49 +08:00
Bai feee92daee fix: Fixed issue of v2 to v3 Account missing `su_from` 2024-04-25 19:13:34 +08:00
Bai 42054c7989 feat: Support asset tree node drag to another one 2024-04-24 18:05:51 +08:00
wangruidong bb4fbc3a1c perf: index page typo 2024-04-24 18:05:03 +08:00
Aaron3S 9b20b67039 fix: 修复执行快捷命令时 local_connection 没有被正确设置 2024-04-23 19:07:22 +08:00
Bai 2acc84dc69 fix: Adhoc support mariadb with module of mysql 2024-04-23 18:57:08 +08:00
ibuler d7916a62f0 perf: 修改翻译 2024-04-23 18:11:05 +08:00
Bai c9858b5a84 fix: 修改配置 RECEPTOR_ENABLED=False 默认 2024-04-23 16:52:44 +08:00
Bai 25e21b185f fix: 修改配置 RECEPTOR_ENABLED 2024-04-23 15:03:04 +08:00
ibuler da27e1b93c perf: 修改翻译 2024-04-23 14:16:21 +08:00
Aaron3S 720231f692 feat: 修改 receptor 容器通信地址 2024-04-23 13:12:18 +08:00
jiangweidong 95f29a584e perf: 优化会话过期500问题 2024-04-23 13:11:41 +08:00
Bai 50cbb75b96 perf: 优化 Web 资产详情时根据 autofill 类型返回对应的 spec_info 信息 2024-04-23 13:09:40 +08:00
Bai d418647774 fix: 修复仪表盘会话排序数量都是 1 的问题 2024-04-22 19:37:45 +08:00
Bai 6b5d4a4810 fix: 修复仪表盘会话排序数量都是 1 的问题 2024-04-22 19:32:42 +08:00
Eric 2cc67634a4 perf: 发布机支持平台连接参数 2024-04-22 16:40:41 +08:00
ibuler 99b24cad00 perf: add open sans font 2024-04-22 15:08:28 +08:00
fit2bot 52922088a9
feat: 优化代码结构，receptor开关，修改为 tcp 通信 (#13078) 
* feat: 优化代码结构，receptor开关，修改为 tcp 通信

* fix: 修改导包路径

* fix: 修复错别字

* fix: 修改导包路径

* perf: 优化代码

* fix: 修复任务不执行的问题

* perf: 优化配置项名称

* perf: 优化代码结构

* perf: 优化代码

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2024-04-22 13:51:52 +08:00
jiangweidong ef7329a721 perf: 优化频繁发送短信，将后端的频繁发送警告提示到页面上来提醒用户 2024-04-22 13:20:51 +08:00
Bai ad0bc82539 perf: 优化 HUAWEI 设备判断逻辑 2024-04-22 13:19:32 +08:00
wangruidong 1ecf8534f6 perf: 兼容自定义平台的华为交换机执行命令 2024-04-22 13:19:32 +08:00
feng 94286caec4 fix: 命令输出取消长度限制 2024-04-22 10:31:35 +08:00
wangruidong d4c8425218 fix: 快捷命令账号选择未按账号数量排序 2024-04-22 10:31:02 +08:00
fit2bot 59f9a4f369
fix: 获取 k8s 树取消异常 返回空 优化错误日志 (#13077) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-19 17:41:41 +08:00
Bai 64125051df fix: Org is None not has id attribute 2024-04-19 17:15:30 +08:00
Bai 660572a0ea fix: merge_delay_run 偶尔会出现 (2006, MySQL server has gone away 的报错) 2024-04-19 17:15:30 +08:00
ibuler c0273dc698 perf: 去掉 js 报错 2024-04-19 11:21:27 +08:00
Bai 2782d4b5f1 fix: 修复 Celery Execution 任务保存失败导致 View 事务回滚的问题（首次登录用户修改密码失败） 2024-04-18 21:21:09 +08:00
ibuler 9dbdd6ac60 perf: change i18n 2024-04-18 20:12:01 +08:00
fit2bot d4f9e30306
perf: translate (#13061) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-18 17:28:55 +08:00
Aaron3S 1b221d1cb6 fix: celery kwargs 参数解析问题 2024-04-18 17:06:09 +08:00
halo fbf42ebbf9 perf: 更新客户端版本 2024-04-18 15:58:50 +08:00
Aaron3S a0c4eae04c perf: 优化变量名， 防止和翻译方法冲突 2024-04-18 14:31:44 +08:00
Aaron3S d1c293940a fix: 修复 celery task not found 的问题 2024-04-18 14:31:44 +08:00
Aaron3S 6f2d04a029 fix: 修复自动化任务重包含多个playbook runtime 目录被提前删除的问题 2024-04-18 14:10:34 +08:00
wangruidong 29dbc2e4d4 perf: 用户详情页-资产授权规则字段排序优化 2024-04-18 13:14:16 +08:00
wangruidong e8d717d174 fix: 资产不存在指定用户的时候，没有用特权用户任务未执行 2024-04-17 20:17:24 +08:00
Aaron3S 138a3a2f46 fix: 修复 receptor_ctl 的并发安全问题 2024-04-17 18:58:20 +08:00
fit2bot cade2cfa13
fix: 改密推送没有更新版本 (#13044) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-17 16:14:40 +08:00
wangruidong ac988a76b4 fix: 重启服务禁用的定时任务会执行问题 2024-04-17 14:25:10 +08:00
ibuler 5a9815481a perf: 修改 token expire 逻辑 2024-04-17 14:23:56 +08:00
ibuler f8953441e3 Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-04-17 14:09:25 +08:00
ibuler 5b41eddacc perf: 修改翻译 2024-04-17 13:49:43 +08:00
feng bfbddfdead fix: 【账号改密】任务列表-详情：获取任务记录tab报错 2024-04-17 11:27:18 +08:00
Aaron3S 3cf526fdf3 fix: 修复测试根节点连接性 task 找不到的问题 2024-04-16 19:27:56 +08:00
Aaron3S f6a4ee54d0 fix: 补充遗漏的网关参数 2024-04-16 19:27:56 +08:00
wangruidong 5755d281d7 perf: ldap测试登录前端不需要先测试连接 2024-04-16 18:13:45 +08:00
Aaron3S 1569524583 fix: 修复调用 ssh_ping 模块测试走网关的资产连接性失败 2024-04-16 17:14:30 +08:00
fit2bot 7ba876eb0a
fix: 登录复核 审批后 刷新页面工单没清除 (#13031) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-16 14:04:18 +08:00
wangruidong a31ea77b3c fix: 会话详情中文件传输显示有误 2024-04-16 10:38:05 +08:00
Aaron3S 44445a9482 fix: 修复一些因使用 receptor runner 造成的 bug 2024-04-15 19:42:36 +08:00
Bai b8449a6efa fix: Export csv file can run program for windows 2024-04-15 19:42:03 +08:00
fit2bot ccf6b00084
perf: 迁移文件和翻译 (#13024) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-15 17:57:47 +08:00
fit2bot 4423f842e0
fix: 历史账号数量计算错误 (#13023) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-15 17:17:11 +08:00
ibuler a432af1a6d perf: 修改翻译 2024-04-15 16:34:02 +08:00
fit2bot 7660e3228e
fix: 【账号推送】创建账号推送失败 (#13021) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-15 14:48:58 +08:00
wangruidong 482f5613e4 fix: 会话详情中文件传输显示有误 2024-04-15 14:42:18 +08:00
吴小白 f987515b89 perf: 优化发布机日志输出 2024-04-15 12:04:26 +08:00
fit2bot f0d1279a42
perf: 修改user session 权限判断 (#13019) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-15 11:26:22 +08:00
halo 140118c9c6 perf: 更新copyright年份 2024-04-15 10:33:45 +08:00
wangruidong 637b9b1b15 perf: 申请工单-指定账号信息优化 2024-04-12 13:26:23 +08:00
Jiangweidong 84a71c8b3a perf: 火山引擎翻译 2024-04-12 13:24:32 +08:00
fit2bot f3bd727c32
perf: 改密失败发给收件人 (#13009) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-12 11:53:47 +08:00
Aaron3S 2ac87e4ad6 feat: 修改重复的删除目录的逻辑 2024-04-12 11:35:51 +08:00
fit2bot 3740a4ad6f
fix: 开启仅一台设置登录 退出失败 (#13007) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-12 11:16:58 +08:00
fit2bot 3bc8db7c3d
fix: 改密任务记录搜索失败 (#13006) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-12 11:02:47 +08:00
fit2bot f3d19ad9f4
fix: 【Lark】绑定时，一些报错信息优化 (#13004) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-12 10:39:49 +08:00
Bai d2396afdd5 fix: User my assets sorted by connectivity did not take effect 2024-04-12 10:39:34 +08:00
Eric 43f9c07838 perf: 优化任务日志输出 2024-04-11 22:27:44 +08:00
Aaron3S 6052306c04 feat: ansible receptor kill 进程 2024-04-11 22:26:01 +08:00
Aaron3S 6a12bc39e9 feat: ansible receptor 适配文件上传 2024-04-11 22:22:29 +08:00
Bai 3f67b40975 fix: Export excel file can running instructions(csv no need deal) 2024-04-11 20:37:17 +08:00
fit2bot 0adc854721
perf: 优化审计台命令记录代码 (#12998) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 18:32:00 +08:00
fit2bot ab76745a9f
perf: 优化审计台仪表盘命令记录总数统计数据库和所有es数据 (#12997) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 18:29:02 +08:00
Aaron3S 574639d5e1 feat: 支持 ansible receptor private 方式认证, 支持运行完成工作空间清理 2024-04-11 17:51:22 +08:00
fit2bot fa5d9d3df4
fix: 二级审批通过，一级审批人员查看不到工单 (#12993) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 16:35:00 +08:00
wangruidong 94b5d8b9e9 perf: 处理停止任务异常情况 2024-04-11 14:25:40 +08:00
Bai bffc9f4b1d fix: Fix session Duration label 2024-04-11 11:00:46 +08:00
wangruidong 6b5d18222e fix: 全局组织-组织角色用户数量不对 2024-04-10 18:20:05 +08:00
Aaron3S 2b05fd5276 fix: 修复 ansible receptor playbook 无法执行的问题 2024-04-10 18:18:32 +08:00
fit2bot 3e46d72ba3
fix: 修复lark登录 Backend错误问题 (#12981) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-10 17:07:48 +08:00
feng 6502adb772 perf: 切换zh hant 2024-04-10 14:39:58 +08:00
fit2bot a8112c86e3
feat: 全面修改 ansible 执行方式为 receptor (#12975) 
* feat: 修复 receptor kill job  的问题

* feat: 全面修改 ansible 执行方式为 receptor

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2024-04-10 11:35:38 +08:00
wangruidong 8911c9c649 fix: Luna引导下载版本更新 2024-04-09 20:10:30 +08:00
Bai 3b70b4cf9e feat: LDAP User Auth support cache user_dn 2024-04-09 20:09:50 +08:00
wangruidong 1e0ea3905e fix: 忘记密码短信验证码过期 2024-04-09 20:05:34 +08:00
ibuler 85cb80cbfe perf: remove gpt category 2024-04-09 18:43:06 +08:00
fit2bot 79f8480ae4
perf: core celery 不做报警 (#12970) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-09 17:07:48 +08:00
Bai dec502e025 perf: Update user orgs roles 2024-04-09 16:52:11 +08:00
Aaron3S c7b5cc7d89 feat: 暂时注释ansible runner write pid 逻辑 2024-04-09 16:46:56 +08:00
Aaron3S bc76ce50e1 feat: 修改 receptor 启动参数 2024-04-09 15:59:14 +08:00
Bai be90bf6b28 perf: Update user orgs roles 2024-04-09 15:43:27 +08:00
hzhfit2cloud dfa68d1ca8 支持中文繁体 2024-04-09 15:18:36 +08:00
hzhfit2cloud 0237edf6c1 支持中文繁体 2024-04-09 15:18:36 +08:00
ibuler f0e87ef3f8 perf: rdp token 复用 
perf: connection token
 2024-04-08 19:03:47 +08:00
fit2bot cd19a276c9
fix: 修复工单申请人过滤问题 (#12957) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-08 18:56:59 +08:00
jiangweidong 5ea4bba676 perf: 优化资产修改激活状态记录操作日志 2024-04-08 18:52:46 +08:00
Bryan 2530827d07
Revert "feat: 支持中文繁体" 2024-04-08 18:04:38 +08:00
Bryan 3456e9ac5b
Merge branch 'dev' into dev 2024-04-08 18:01:55 +08:00
fit2bot 689f858f97
feat: 支持 ansible 沙盒运行 (#12953) 
* feat: 支持 ansible 沙盒运行

* feat: 修改 receptor sock 默认路径

* feat: 增加 adhoc 执行命令的 local connection 权限

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2024-04-08 17:54:34 +08:00
wangruidong e61f9efbf2 perf: 内置平台置顶 2024-04-08 16:33:44 +08:00
ibuler 97f60a61e0 perf: 修改翻译 2024-04-08 14:32:14 +08:00
Bai 45bac09dc7 perf: ROOT Org show orgs-and-roles in user-detail page 2024-04-08 14:00:57 +08:00
Eddie 989a970a7c
簡轉繁 2024-04-07 10:57:48 +00:00
Eddie 0296df0480
簡轉繁 2024-04-07 10:31:04 +00:00
wangruidong 9776d35140 perf: 批量上传添加权限校验 2024-04-07 15:49:41 +08:00
fit2bot 0aeea414f5
fix: 支持 SSO 用户登录时校验 (#12923) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-07 14:57:38 +08:00
Bai 9817154234 perf: 优化所有View默认排序规则(name) 2024-04-03 19:10:34 +08:00