Commit Graph

8324 Commits

Author SHA1 Message Date
jiangweidong
be875638ed Merge branch 'v3' of https://github.com/jumpserver/jumpserver into pr@v3@feat_db_automations 2022-11-09 18:23:10 +08:00
jiangweidong
8e2c048f0c feat: 支持Oracle、MongoDB、SQLServer数据库的自动化脚本部分功能 2022-11-09 18:23:00 +08:00
fit2bot
a5cef74356
perf: serializer (#9034)
Co-authored-by: feng <1304903146@qq.com>
2022-11-09 18:15:21 +08:00
Eric
1b2eda51e3 perf: get host applet by name 2022-11-09 16:14:25 +08:00
feng
cf4744791a fix: automation execution bug 2022-11-09 15:55:48 +08:00
feng
3b4e388ed0 perf: gather account api adjustment 2022-11-09 15:42:21 +08:00
fit2bot
6ef5154d4d
fix: swagger (#9031)
Co-authored-by: feng <1304903146@qq.com>
2022-11-09 13:34:29 +08:00
ibuler
2d479d1ffa Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-09 11:44:38 +08:00
ibuler
71846241ae pref: 优化授权 api 返回字段 2022-11-09 11:43:55 +08:00
fit2bot
0ff8758ea8
perf: gather account automation api (#9029)
Co-authored-by: feng <1304903146@qq.com>
2022-11-08 20:33:55 +08:00
ibuler
d040b4cfe0 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 19:19:28 +08:00
ibuler
5730265183 pref: 修改 account secret_type 类型 2022-11-08 19:18:04 +08:00
fit2bot
ce9ebd94ec
perf: change secret automation api (#9028)
Co-authored-by: feng <1304903146@qq.com>
2022-11-08 17:54:51 +08:00
Eric
e69bb9f83e perf: applet host accounts should be inactive by default 2022-11-08 17:54:04 +08:00
Jiangjie.Bai
5e52d04df3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 14:30:16 +08:00
Jiangjie.Bai
cd93de4c00 perf: 优化 Connection Token API 逻辑处理 2022-11-08 14:30:07 +08:00
ibuler
ba38771d1a perf: 修改 applets related 2022-11-08 13:55:06 +08:00
ibuler
df14d01859 pref: 修改信号创建 accounts 2022-11-08 10:41:06 +08:00
ibuler
2e784311d3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-07 20:41:55 +08:00
ibuler
afe6c8ebbd pref: 修改 applet host api 2022-11-07 20:41:18 +08:00
Eric
43e1417a25 perf: update tinker playbook 2022-11-07 19:18:12 +08:00
feng
a13527c5c8 perf: platform charset 2022-11-07 19:17:02 +08:00
Jiangjie.Bai
6812cbe314 perf: 优化优先使用系统设置中的 rdp_resolution 配置 2022-11-07 18:47:06 +08:00
feng
b4f511a7ff perf: account backup 2022-11-07 17:01:28 +08:00
fit2bot
1cc983b2eb
perf: automation button (#9023)
Co-authored-by: feng <1304903146@qq.com>
2022-11-07 16:10:26 +08:00
ibuler
2705c38ba1 pref: 添加命令启动失败 debug 2022-11-07 10:47:06 +08:00
ibuler
045bc3661a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 20:16:29 +08:00
ibuler
0fb96091cc perf: 优化代码速度 2022-11-04 20:15:31 +08:00
ibuler
4405064e78 pref: 添加 api debug timer 2022-11-04 20:14:19 +08:00
fit2bot
dca92a1e04
perf: push account (#9020)
Co-authored-by: feng <1304903146@qq.com>
2022-11-04 19:18:15 +08:00
Jiangjie.Bai
a255bd21b4 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 18:47:00 +08:00
Jiangjie.Bai
5447ee6c39 feat: 修改获取用户-资产授权的账号列表目录结构; 2022-11-04 18:46:49 +08:00
Jiangjie.Bai
3bba8e4043 fix: 修改翻译文件 2022-11-04 15:50:38 +08:00
Jiangjie.Bai
8abf954015 fix: 处理一波迁移文件 2022-11-04 15:36:45 +08:00
Jiangjie.Bai
1a77dc44cd fix: django.mo 2022-11-04 15:00:58 +08:00
fit2bot
13ae50f5d0
feat: 自定义MFA认证逻辑 (#8891)
* feat: 自定义MFA认证

* feat: 修改翻译信息

Co-authored-by: halo <wuyihuangw@gmail.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 14:29:15 +08:00
jiangweidong
2029e9f8df
feat: 重构操作日志 (#8941)
* feat:重构操作日志模块

* feat: 改密计划增加操作日志记录

* feat: 支持操作日志接入ES,且接口limit支持自定义限制大小

* feat:翻译

* feat: 生成迁移文件

* feat: 优化迁移文件

* feat: 优化多对多日志记录

* feat: 命令存储ES部分和日志存储ES部分代码优化

* feat: 优化敏感字段脱敏

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 14:22:38 +08:00
jiangweidong
1e97a23bc5
feat: 忘记密码支持手机短信找回,并修改邮箱方式和手机方式统一 (#8960)
* feat: 忘记密码支持通过手机找回,邮箱方式修改为和手机方式一致

* feat: 翻译

* feat: 修改翻译

* fix: 还原

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 13:56:55 +08:00
ibuler
037cd90f09 pref: 修改 migrations 2022-11-04 13:29:28 +08:00
ibuler
fbf65f437a merge: with merge remote 2022-11-04 11:43:34 +08:00
jiangweidong
262d070f3c feat: 支持纳管 clickhouse[Web Terminal] 2022-11-04 11:41:54 +08:00
ibuler
30106bdbbb perf: 修改组件状态 2022-11-04 11:40:16 +08:00
feng
1981bdd3ac perf: account serializer 2022-11-04 11:39:34 +08:00
feng
8b05bc4b82 perf: 多节点发送文件失败 2022-11-04 11:15:34 +08:00
dependabot[bot]
4ceaba60ed build(deps): bump django from 3.2.15 to 3.2.16 in /requirements
Bumps [django](https://github.com/django/django) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-04 11:13:51 +08:00
jiangweidong
40b7331ec0 feat: 支持网域网关应用改密-添加依赖 2022-11-04 11:13:07 +08:00
feng
e995e3b35a perf: change secret adjustment 2022-11-04 11:09:56 +08:00
jiangweidong
04cda3da0b feat: 云同步支持金山云 2022-11-04 11:09:02 +08:00
fit2bot
ebfc3b7b38
perf: change secret (#9014)
Co-authored-by: feng <1304903146@qq.com>
2022-11-03 22:39:48 +08:00
Eric
7560a5cd1f perf: deploy applet host 2022-11-03 18:03:46 +08:00