Commit Graph

8243 Commits

Author SHA1 Message Date
jiangweidong
69d8dc4bb3 perf: 增加DB_USE_SSL配置和redis配置统一 2022-11-24 16:01:26 +08:00
jiangweidong
2d86c8c843 Merge branch 'v3' of http://github.com/jumpserver/jumpserver into pr@v3@feat_support_clear_private_key 2022-11-24 15:25:17 +08:00
jiangweidong
9e41ad0764 feat: 支持账号更新界面清空存在的秘钥信息 2022-11-24 15:25:09 +08:00
吴小白
3dde2a44e8
Merge pull request #9108 from jumpserver/pr@dev@perf_redis_sentinel_support_ssl
perf: 支持sentinel开启ssl(Sentinel和Redis公用一套证书,无额外增加配置项)
2022-11-24 14:44:25 +08:00
feng
da9516608f Merge remote-tracking branch 'origin/v3' into v3 2022-11-24 10:55:43 +08:00
Aaron3S
d977013dc6 Merge remote-tracking branch 'origin/v3' into v3 2022-11-24 00:52:45 +08:00
Aaron3S
fa948f7327 feat: job 增加组织限制 2022-11-24 00:50:37 +08:00
fit2bot
d44d475cae
perf: gateway (#9115)
Co-authored-by: feng <1304903146@qq.com>
2022-11-23 18:39:05 +08:00
feng
3d6609ec8c perf: gateway 2022-11-23 18:36:42 +08:00
ibuler
abfd472a0a perf: 修改 connect token 2022-11-23 16:11:17 +08:00
ibuler
075cadb1ab merge: with remote 2022-11-22 21:56:30 +08:00
ibuler
779161d79a perf: 修改 connection token 2022-11-22 21:54:40 +08:00
dependabot[bot]
5f4c7e8cf0
build(deps): bump pillow from 9.1.1 to 9.3.0 in /requirements
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.1.1 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.1.1...9.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-22 11:21:50 +00:00
fit2bot
1a204618f7
[v3] perf: migrate gateway to asset (#8928)
* perf: migrate gateway to asset

* perf: asset discriminate gateway

Co-authored-by: feng626 <1304903146@qq.com>
2022-11-22 17:33:09 +08:00
feng
873b81e639 perf: ticket migrate 2022-11-22 11:36:48 +08:00
Jiangjie.Bai
d543c3efe7 fix: 修复 favorite-assets Serializer 缺少 protocols 字段的问题 2022-11-22 11:05:52 +08:00
吴小白
436cb7b6e1 feat: 添加 Dockerfile.loong64 2022-11-22 10:15:55 +08:00
feng
4b26fb3e6e fix: jms upgrade_db bug 2022-11-21 19:54:00 +08:00
jiangweidong
c316ad2dbd perf: 支持sentinel开启ssl 2022-11-21 18:27:20 +08:00
feng
f39a3a34e4 perf: change secret ignore secret type 2022-11-21 16:23:32 +08:00
feng
94526e44f1 perf: change secret timedelta 2022-11-21 15:18:09 +08:00
ibuler
6d5be66b5e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-18 19:29:52 +08:00
ibuler
fc1b6c9db2 pref: 修改 endpoint api 2022-11-18 19:29:19 +08:00
Aaron3S
d0de36358c feat: 支持定时任务 2022-11-18 18:47:48 +08:00
feng
c785225ff2 fix: es 默认存储500 2022-11-18 17:05:15 +08:00
Bai
0eb550f39b fix: flower db file 持久化存储flower信息 2022-11-18 15:36:45 +08:00
Bryan
264c97888f fix: 修复 channels-redis 库升级导致 ws 查看任务日志失败的问题; 修改 REDIS_LAYERS_HOST 变量; 修改 Channel SSL 配置项; 2022-11-18 15:25:27 +08:00
fit2bot
223814f897
perf: migrate (#9098)
Co-authored-by: feng <1304903146@qq.com>
2022-11-18 11:30:31 +08:00
ibuler
b1bd57cd76 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-17 20:49:31 +08:00
ibuler
04ee7ee0e7 pref: 后端返回 connect types 2022-11-17 20:48:50 +08:00
Aaron3S
24ed11e2a5 feat: 运行job 支持动态参数 2022-11-17 20:10:13 +08:00
feng
49a4ceba85 perf: ticket 2022-11-17 19:20:54 +08:00
feng
543d61442c perf: ticket accounts 2022-11-17 18:04:38 +08:00
Jiangjie.Bai
e629e6fb3f fix: i18n 2022-11-17 17:40:35 +08:00
halo
1b99a7e06f fix: 账户备份邮件发送找不到文件bug 2022-11-17 17:39:53 +08:00
fit2bot
71122312cf
perf: ticket optimization (#9094)
Co-authored-by: feng <1304903146@qq.com>
2022-11-17 17:34:52 +08:00
Eric
30f37d9ebf perf: deployment task log order by date 2022-11-17 16:39:49 +08:00
Eric
ef3654ffa4 perf: update applet delopyment task 2022-11-17 16:03:26 +08:00
fit2bot
3a62abf381
perf: ticket action (#9090)
Co-authored-by: feng <1304903146@qq.com>
2022-11-17 15:07:23 +08:00
ibuler
a42641ca9a fix: 修复 redis 连接导致的 pub sub 错误 2022-11-17 14:07:43 +08:00
halo
90c48d303e fix: celery任务时间字段差8小时问题 2022-11-17 14:06:31 +08:00
fit2bot
73c2155864
perf: ticket serializer (#9075)
Co-authored-by: feng <1304903146@qq.com>
2022-11-17 13:52:10 +08:00
jiangweidong
949166eaed fix: Redis哨兵切换时导致core和celery组件监听线程异常退出 2022-11-17 12:19:35 +08:00
ibuler
4591b03e17 pref: 修改 terminal methods 2022-11-17 11:46:35 +08:00
Eric
8a1a7d9e13 fix: remove unused serializer_class 2022-11-17 11:04:50 +08:00
Aaron3S
12816d49f6 Merge remote-tracking branch 'origin/v3' into v3 2022-11-17 10:50:50 +08:00
Aaron3S
43fee40c46 feat: 作业支持增加参数和执行路径超时时间等 2022-11-16 21:06:14 +08:00
ibuler
e2001d7779 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 21:06:08 +08:00
ibuler
fb653f93db pref: 修改添加 connect methods 2022-11-16 21:05:15 +08:00
Jiangjie.Bai
a2b9a5cee3 fix: 修复删除数据库由于端口数量限制导致不能删除的问题 2022-11-16 21:04:12 +08:00