225 Commits (3971fce561c23ed3f15ce108434eb474f423a4cc)

Author	SHA1	Message	Date
Jiangjie.Bai	a27aeca2fd	refactor: 修改授权相关Model,Serializer,API结构	2 years ago
ibuler	585ce6b46a	perf: 修改表结构	2 years ago
feng626	62f8fac392	修复迁移文件	2 years ago
feng626	ca3d2271a8	merge v3	2 years ago
ibuler	2c3239e238	perf: 修改数据库 migrations	2 years ago
ibuler	8282a6869a	perf: remove system users	2 years ago
ibuler	3f47e63080	perf: remove system user	2 years ago
fit2bot	4cad5affec	fix: 修复工单火狐浏览器上页面展示 (#8753) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
ibuler	2948d5af7f	perf: 删除一部分 system user	2 years ago
ibuler	b8f8c2a264	perf: remove application permission	2 years ago
fit2bot	1ed388459b	fix: 工单流 全局组织不能更新 (#8735) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
ibuler	fb0fb71ea3	perf: 修改系统用户	2 years ago
feng626	0f7b41d177	fix: super ticket close bug	2 years ago
fit2bot	dc32224294	feat: 应用工单支持选择动作 (#8651) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	93537c07a1	fix: 修复工单授权组织问题 (#8599) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	f758414844	fix: 审批时 来着不同组织的资产校验 (#8586) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	2abca39597	fix: ticket bug (#8584) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	11e538d417	fix: 工单三方审批不支持修改资产 (#8582) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	b5cfc6831b	feat: 工单支持审批时修改资产 (#8549) ... Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	2 years ago
fit2bot	001e5d857f	pref: debug toolbar 太费时间 先禁用 (#8528) ... * perf: 修改主题色 * pref: debug toolbar 太费时间 先禁用 * perf: 修改颜色 * perf: 优化 interface * perf: 修改 avartar * perf: css color Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
fit2bot	927ae43af2	perf: 优化工单 (#8524) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	9465138faf	fix: 修复工单迁移文件 (#8513) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	081089d636	fix: 修复工单命令复合迁移问题 (#8512) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	067a90ff9a	fix: 修复工单数据库命令复合bug (#8511) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	b33e376c90	fix: 解决一些工单已知问题 (#8501) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	fd7f73a18e	fix: 修复工单权限问题 (#8493) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	8247f24d3f	fix: 修复工单bug (#8488) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
feng626	9388f37c39	fix: ticket bug	2 years ago
feng626	b264db3e7e	fix: 修复工单迁移文件	2 years ago
fit2bot	7e2f81a418	perf: 重构 ticket (#8281) ... * perf: 重构 ticket * perf: 优化 tickets * perf: 暂存 * perf: 建立 ticket model * perf: 暂存一下 * perf: 修改 tickets * perf: 修改 import * perf: 修改model * perf: 暂存一波 * perf: 修改... * del process_map field * 工单重构 * 资产 应用对接前端 * perf: 修改 ticket * fix: bug * 修改迁移文件 * 添加其他api * 去掉process_map * perf: 优化去掉 signal * perf: 修改这里 * 修改一点 * perf: 修改工单 * perf: 修改状态 * perf: 修改工单流转 * step 状态切换 * perf: 修改 ticket open * perf: 修改流程 * perf: stash it * 改又改 * stash it * perf: stash * stash * migrate * perf migrate * 调整一下 * 修复bug * 修改一点 * 修改一点 * 优化一波 * perf: ticket migrations Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
Jiangjie.Bai	3fde31f2e0	fix: 修复工单自定义搜索时500的问题	2 years ago
feng626	14710e9c9e	feat: 工单审批人中去除申请人	3 years ago
Jiangjie.Bai	2a5497de14	fix: 修改工单审批文案	3 years ago
jiangweidong	b44fa64994	perf: 企业微信、钉钉工单审批增加拒绝功能 (#8208) ... * perf: 工单直接审批增加拒绝功能 * feat: 翻译 * perf: 修改动作名词 * perf: 修改翻译	3 years ago
fit2bot	031077c298	perf: password 等使用 rsa 加密传输 (#8188) ... * perf: 修改 model fields 路径 * stash it * pref: 统一加密方式，密码字段采用 rsa 加密 * pref: 临时密码使用 rsa * perf: 去掉 debug msg * perf: 去掉 Debug * perf: 去掉 debug * perf: 抽出来 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
jiangweidong	c56179e9e4	feat: 支持企业微信、钉钉直接审批工单 (#8115)	3 years ago
fit2bot	1f8ded49fa	feat: 工作台区分组织 (#8040) ... * perf: 工作台受组织角色控制 * perf: workspace => workbench * perf: 修改 workspace codename Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	5cc2fdae4f	fix: 修复api docs打不开的问题 (#7938) ... Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	3 years ago
feng626	e8653c74cd	fix: ticket URL type	3 years ago
feng626	3a26b9d102	fix: 修复工单相应bug	3 years ago
Jiangjie.Bai	572c5b6925	fix: 修改工单管理权限位	3 years ago
fit2bot	a18b9bad0a	fix:  修复ticketsession (#7857) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
fit2bot	d77e84e6f8	fix: ticket comment bug (#7854) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
fit2bot	f0325c48df	fix: 工单权限 (#7808) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
fit2bot	1b007c8c5c	perf: 修改权限树 (#7757) ... * perf: 修改 rbac tree * perf: 修改权限树 * perf: 修改用户默认权限 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	dafc416783	Fix rbac (#7728) ... * perf: 重命名 signal handlers * fix: 修复 ticket processor 问题 * perf: 修改 ticket 处理人api * fix: 修复创建系统账号bug * fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序 * perf: 修改 authentication token * fix: 修复上传权限bug * fix: 登录页面增加i18n切换; * fix: 系统角色删除限制 * perf: 修改一下 permissions tree * perf: 生成 i18n * perf: 修改一点点 Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	3 years ago
fit2bot	ab1024fbf4	perf: 优化 super ticket 的状态 (#7714) ... * fix: token 系统用户增加 protocol * fix: 修复清除orphan session时同时清除对应的 session_task * perf: 修改 connection token api * fix: 修复无法获取系统角色绑定的问题 * perf: 增加 db terminal 及 magnus 组件 * perf: 修改 migrations * fix: 修复AUTHENTICATION_BACKENDS相关的逻辑 * fix: 修改判断backend认证逻辑 * fix: 修复资产账号查看密码跳过mfa * fix: 修复用户组授权权限错误 * feat: 支持COS对象存储 * feat: 升级依赖 jms_storage==0.0.42 * fix: 修复 koko api 问题 * feat: 修改存储翻译信息 * perf: 修改 ticket 权限 * fix: 修复获取资产授权系统用户 get_queryset * perf: 抽取 ticket * perf: 修改 cmd filter 的权限 * fix: 修改 ticket perm * perf: 修改工单的api Co-authored-by: Eric <xplzv@126.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com> Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local> Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
Jiangjie.Bai	03afa4f974	Fix rbac (#7713) ... * fix: token 系统用户增加 protocol * fix: 修复清除orphan session时同时清除对应的 session_task * perf: 修改 connection token api * fix: 修复无法获取系统角色绑定的问题 * perf: 增加 db terminal 及 magnus 组件 * perf: 修改 migrations * fix: 修复AUTHENTICATION_BACKENDS相关的逻辑 * fix: 修改判断backend认证逻辑 * fix: 修复资产账号查看密码跳过mfa * fix: 修复用户组授权权限错误 * feat: 支持COS对象存储 * feat: 升级依赖 jms_storage==0.0.42 * fix: 修复 koko api 问题 * feat: 修改存储翻译信息 * perf: 修改 ticket 权限 * fix: 修复获取资产授权系统用户 get_queryset * perf: 抽取 ticket * perf: 修改 cmd filter 的权限 * fix: 修改 ticket perm * fix: 修复oidc依赖问题 Co-authored-by: Eric <xplzv@126.com> Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local> Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
xinwen	f460916e84	fix: swagger	3 years ago
ibuler	db050e405d	fix: 修改 migrations	3 years ago
fit2bot	e259d2a9e9	fix: fix rbac to dev (#7636) ... * feat: 添加 RBAC 应用模块 * feat: 添加 RBAC Model、API * feat: 添加 RBAC Model、API 2 * feat: 添加 RBAC Model、API 3 * feat: 添加 RBAC Model、API 4 * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC 整理权限位 * feat: RBAC 整理权限位2 * feat: RBAC 整理权限位2 * feat: RBAC 整理权限位 * feat: RBAC 添加默认角色 * feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定 * feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定 * feat: RBAC 修改用户模块API * feat: RBAC 添加组织模块迁移文件 & 修改组织模块API * feat: RBAC 添加组织模块迁移文件 & 修改组织模块API * feat: RBAC 修改用户角色属性的使用 * feat: RBAC No.1 * xxx * perf: 暂存 * perf: ... * perf(rbac): 添加 perms 到 profile serializer 中 * stash * perf: 使用init * perf: 修改migrations * perf: rbac * stash * stash * pref: 修改rbac * stash it * stash: 先去修复其他bug * perf: 修改 role 添加 users * pref: 修改 RBAC Model * feat: 添加权限的 tree api * stash: 暂存一下 * stash: 暂存一下 * perf: 修改 model verbose name * feat: 添加model各种 verbose name * perf: 生成 migrations * perf: 优化权限位 * perf: 添加迁移脚本 * feat: 添加组织角色迁移 * perf: 添加迁移脚本 * stash * perf: 添加migrateion * perf: 暂存一下 * perf: 修改rbac * perf: stash it * fix: 迁移冲突 * fix: 迁移冲突 * perf: 暂存一下 * perf: 修改 rbac 逻辑 * stash: 暂存一下 * perf: 修改内置角色 * perf: 解决 root 组织的问题 * perf: stash it * perf: 优化 rbac * perf: 优化 rolebinding 处理 * perf: 完成用户离开组织的问题 * perf: 暂存一下 * perf: 修改翻译 * perf: 去掉了 IsSuperUser * perf: IsAppUser 去掉完成 * perf: 修改 connection token 的权限 * perf: 去掉导入的问题 * perf: perms define 格式，修改 app 用户 的全新啊 * perf: 修改 permission * perf: 去掉一些 org admin * perf: 去掉部分 org admin * perf: 再去掉点 org admin role * perf: 再去掉部分 org admin * perf: user 角色搜索 * perf: 去掉很多 js * perf: 添加权限位 * perf: 修改权限 * perf: 去掉一个 todo * merge: with dev * fix: 修复冲突 Co-authored-by: Bai <bugatti_it@163.com> Co-authored-by: Michael Bai <baijiangjie@gmail.com> Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
feng626	ff9347e344	fix: 工单流需要超级管理员配置	3 years ago
feng626	7f36958683	perf: 工单流只需组织管理员权限	3 years ago
feng626	889713f00e	fix: 修复工单流程设置显示其它组织问题	3 years ago
feng626	e33a67daf6	fix: 修复工单审批后审批人与记录人不一致问题	3 years ago
xinwen	088676d998	fix: 计算工单序号的时候切换到root组织	3 years ago
feng626	6a4ffcc9ad	fix: 修复工单审批后state不准问题	3 years ago
xinwen	43c4c78378	fix: 工单序号添加排序	3 years ago
Michael Bai	620834c817	fix: 修改工单迁移文件warining问题 ... Any fields that are stored with VARCHAR column types may have their max_length restricted to 255 characters if you are using unique=True for the field. See: https://docs.djangoproject.com/en/3.1/ref/databases/#mysql-character-fields	3 years ago
xinwen	5cdc4c3c28	feat: 工单添加序号	3 years ago
xinwen	bd84edea62	feat: 资产登录工单页面增加监控与中断	3 years ago
Michael Bai	de9516dee5	feat: 应用授权增加Action动作控制	3 years ago
feng626	38c870a0b5	perf: 工单流对应受理人懒加载	3 years ago
feng626	e4178849ba	perf: ticket filter	3 years ago
feng626	9b9e32d2f4	perf: 工单根据选择组织自动选择流	3 years ago
feng626	ac4b6e5b96	feat: 工单创建资产添加节点	3 years ago
feng626	4a786baf4e	perf: 工单提示信息优化	3 years ago
feng626	3ae8da231a	perf: 工单错误提示优化	3 years ago
Michael Bai	28a6024b49	fix: 修改工单列表默认按照创建日志倒叙排序，修改翻译	3 years ago
ibuler	6cf2bc4baf	pref: 优化工单验证	3 years ago
Michael Bai	3fffd667dc	fix: 修改系统用户、工单列表排序字段	3 years ago
feng626	d3920a0cc9	Merge pull request #7065 from jumpserver/pr@dev@ticket_bug ... fix: 修复工单发邮件及授权资产备注信息修改	3 years ago
feng626	52889cb67a	fix: 修复工单发邮件及授权资产备注信息修改	3 years ago
ibuler	cd5094f10d	perf: 优化通知中的连接点击	3 years ago
fit2bot	c244cf5f43	pref: 修改使用的消息内容 (#7061) ... * perf: 再次优化通知 * pref: 修改使用的消息内容 * perf: 修复url地址 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
feng626	ea485c3070	fix: 修复工单结束重复发送受理人消息bug	3 years ago
Michael Bai	06de6c3575	fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验	3 years ago
ibuler	c341d01e5a	perf: 修改工单信息	3 years ago
ibuler	10f4ff4eec	fix: 修复工单通知内容bug	3 years ago
feng626	a78b2f4b62	fix: 修复工单发消息报错	3 years ago
ibuler	a1f1dce56b	perf: 修改格式错误	3 years ago
fit2bot	00d434ceea	perf: 优化消息通知 (#7024) ... * perf: 优化系统用户列表 * stash * perf: 优化消息通知 * perf: 修改钉钉 * perf: 修改优化消息通知 * perf: 修改requirements * perf: 优化datetime Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	9acfd461b4	feat: user login acl (#6963) ... * feat: user login acl * 添加分时登陆 * acl 部分还原 * 简化acl判断逻辑 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	3 years ago
feng626	5923562440	perf: 工单优化	3 years ago
feng626	f2d743ec2b	perf: 工单优化	3 years ago
feng626	743c9bc3f1	fix: 过滤其它类型app	3 years ago
feng626	3cba8648cb	fix: 工单日期bug	3 years ago
feng626	5a6b64eebd	fix: 工单失效日期小于开始日期	3 years ago
feng626	a6b40510d0	fix: ticket_notice_bug	3 years ago
feng626	c5f4ecc8cc	fix: 修复工单消息推送bug	3 years ago
feng626	39507ef152	fix: 工单不同组织取相应资产的名字	3 years ago
feng626	55a5dd1e34	fix: ticket bug	3 years ago
feng626	75b76170f9	feat: 工单多种审批	3 years ago
feng626	ea4dccbab8	fix: 修复工单bug	3 years ago
feng626	345c0fcf4f	fix: 修复工单流bug 添加登陆审核配置	3 years ago
feng626	c27230762b	perf: 只保留app asset flow	3 years ago
feng626	900fc4420c	perf: 只保留app asset flow	3 years ago
feng626	0a3e5aed56	perf: 授权分类采用from_ticket字段	3 years ago
feng626	4214b220e1	feat: 授权规则分类管理	3 years ago
feng626	ae80797ce4	fix: 修复工单迁移bug	3 years ago