github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,396 Commits
67 Branches
247 Tags
108 MiB
Commit Graph

39 Commits (bb23c2a9fab32bf1755a1ee07a97bae9f3ab14de)

Author SHA1 Message Date
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
ibuler 17627390f8 perf: 修改 account 序列号字段 2022-12-21 18:36:15 +08:00
feng 408c6c568a perf: account backup 2022-12-12 12:33:45 +08:00
Bai 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题； 
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时，会默认先创建 spm 值，
后端调用 get_object 方法时，使用的queryset，就是spm所对应的queryset，
而 detail=True， 查询的值是当前 account_id，不在 queryset 中，
所以会导致调用父类的 get_object 方法报错，对象找不到
 2022-12-07 19:26:28 +08:00
Bai 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty 2022-12-06 19:41:26 +08:00
Bai 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField 2022-12-06 18:54:13 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160) 
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-12-06 11:03:14 +08:00
老广 bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
fit2bot 4f718f9b1f
perf: account template secret api (#9127) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 15:54:16 +08:00
jiangweidong 9e41ad0764 feat: 支持账号更新界面清空存在的秘钥信息 2022-11-24 15:25:09 +08:00
fit2bot a5cef74356
perf: serializer (#9034) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 18:15:21 +08:00
ibuler 5730265183 pref: 修改 account secret_type 类型 2022-11-08 19:18:04 +08:00
feng b4f511a7ff perf: account backup 2022-11-07 17:01:28 +08:00
ibuler 4405064e78 pref: 添加 api debug timer 2022-11-04 20:14:19 +08:00
feng 1981bdd3ac perf: account serializer 2022-11-04 11:39:34 +08:00
feng 7087d5a74e perf: account specific 2022-11-03 12:42:57 +08:00
Jiangjie.Bai 6ed946541d merge: local 2022-10-25 18:45:13 +08:00
feng a445e47f3d perf: account add platform_id 2022-10-25 15:07:51 +08:00
ibuler 168de45da5 pref: 优化 device api 2022-10-20 20:06:58 +08:00
ibuler c55d3c0b6c perf: 添加 histories 2022-10-20 16:39:11 +08:00
ibuler 8c92a9934b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-18 20:38:03 +08:00
ibuler 9b44ed55c2 pref: 修改 secret encrypt 2022-10-18 20:37:17 +08:00
feng 4f16c1f92c fix: account init 500 2022-10-17 17:56:19 +08:00
ibuler 234acd6317 perf: 修改 accounts 2022-09-23 18:59:19 +08:00
ibuler 1b0195cb82 perf: 修改 asset 结构 2022-09-21 11:17:14 +08:00
ibuler 79ce1215f5 merge: with remote branch 2022-09-20 17:47:40 +08:00
feng626 615f36c6f6 perf: 收集账号 2022-09-20 16:18:23 +08:00
ibuler 8c72bab82d perf: 优化 account 结构 2022-09-20 13:54:25 +08:00
feng626 108ccf5a8b perf: 账号管理api 2022-09-19 17:00:03 +08:00
ibuler 9b2acfe4a4 perf: 优化平台 2022-09-15 21:20:56 +08:00
ibuler 37bbf75f66 perf: 修改数据库迁移文件 2022-09-14 20:55:14 +08:00
ibuler ae189ebdfe perf: 修改 account serializer 2022-09-13 21:18:04 +08:00
ibuler 4fcbdfa3f4 perf: 优化 account 添加 name 2022-09-13 21:07:20 +08:00
ibuler 50cf40eaeb perf: 完美解决 accounts 创建 2022-09-07 20:24:48 +08:00
ibuler 585ce6b46a perf: 修改表结构 2022-09-06 19:57:03 +08:00
ibuler d7d9fe2718 perf: 修改 model 2022-09-01 14:46:31 +08:00
ibuler 585f0c64cd perf: 修改 v3 2022-08-30 11:56:56 +08:00
feng626 3e1c832964 账号备份 2022-08-29 19:49:45 +08:00
feng626 76390d013e 账号模版 2022-08-24 16:36:42 +08:00