540 Commits (9439035b866ccf8ef1d10385911ec12e99b38a48)

Author	SHA1	Message	Date
fit2bot	fc4a77df1a	fix: 账号导入500 (#10255) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	8b98bbddaa	perf: custom fields 仅custom 类型资产支持	2 years ago
ibuler	5921b2ee8f	perf: 修改默认节点	2 years ago
fit2bot	cff4309b03	fix: export assets (#10224) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
fit2bot	2b00e6e3a1	fix: 修复资产列表 mini 时报错 (#10220) ... Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
fit2bot	b1374c6aba	fix: 更新平台 ansible_enabled 未设置 (#10210) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
fit2bot	1eb8e40d3e	feat: 账号推送附加参数 (#10080) ... * feat: 账号推送附加参数 * perf: 通过节点 资产 过滤平台api * perf: push automation params * perf: 修改playbook * perf: params serializer * perf: 账号推送playbook 调整 * perf: Automation serializer add params field * perf: params 非必填 * perf: 添加is_params 给前端判断 * perf: is_params bool * perf: 修改push account ansible逻辑 * perf: 修改获取push_kwargs方法 * perf: platform migrate * perf: 修改api * perf: 单个推送 * perf: push account * perf: 修改asset auto_config --------- Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	2 years ago
jiangweidong	e12b832992	perf: 关闭SFTP后，luna界面不显示相应选项 (#10186) ... * perf: 关闭SFTP后，luna界面不显示相应选项 * perf: 修改默认值 * perf: 增加资产协议冗余字段，减少关联查询 * perf: 修改 * perf: 优化 * perf: 精简 * perf: 删掉空格 * perf: 修改继承类	2 years ago
fit2bot	4654756966	fix: 修复账号克隆 500 (#10192) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	36813f64db	perf: 修改 device platform 支持 su	2 years ago
fit2bot	1248458451	perf: 优化支持 choices (#10151) ... * perf: 支持自定义类型资产 * perf: 改名前 * perf: 优化支持 choices * perf: 优化自定义资产 * perf: 优化资产的详情 * perf: 修改完成自定义平台和资产 --------- Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
老广	9af2974bad	Merge pull request #10104 from O-Jiangweidong/pr@dev@feat_windows_winrm ... feat: Windows类型资产增加winrm协议	2 years ago
fit2bot	c5340b5adc	perf: 修改 account (#10088) ... * perf: 优化账号创建策略 * perf: 修改账号 * perf: 修改 account * perf: 修改 account * perf: 修改批量创建 * perf: 修改账号批量创建 * perf: 继续优化账号批量添加 * perf: 优化创建 accounts 的结果 * perf: 优化账号批量返回的格式 * perf: 优化账号 --------- Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
jiangweidong	cab72c6991	feat: Windows类型资产增加winrm协议	2 years ago
Eric	118d33fa02	perf: 支持 super 方式的切换用户	2 years ago
Bai	66d368f882	fix: 修改nodes_display required = False	2 years ago
Bai	30ab6836ab	fix: 修改 login_button	2 years ago
Bai	5d022c7056	fix: 修复资产导入支持填写节点路径	2 years ago
fit2bot	f7ae23f7d9	perf: 导入资产账号模版api优化 (#10038) ... Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	2 years ago
ibuler	47c207ce13	perf: 硬件设备支持账号切换	2 years ago
老广	463d54a4d8	Merge pull request #10023 from jumpserver/pr@dev@asset_accounts_secret_type_default ... perf: 设置资产账号的默认值，方便导入	2 years ago
ibuler	aca0d62feb	perf: 优化 protocols	2 years ago
ibuler	ba076f6612	perf: 优化提示	2 years ago
ibuler	180ded1773	perf: 修改 platform protocols	2 years ago
ibuler	cac59db1ec	perf: 设置资产账号的默认值，方便导入	2 years ago
ibuler	891d9d36b0	fix: windows 平台默认不开启 console	2 years ago
ibuler	2b7f90349c	perf: 优化资产平台的获取	2 years ago
ibuler	6bb42b8d59	perf: 优化 csv import export	2 years ago
ibuler	fa3bfceddc	perf: 优化导入导出 ... perf: remove debug perf: 修改账号导入导出 perf: 去掉一些 debug	2 years ago
fit2bot	3658ecce0c	perf: 修改 ssh key with pass 报错 (#9917) ... Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
fit2bot	797c7635a7	perf: asset hardwareinfo (#9813) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	22a1d60e3f	perf: 优化 msg	2 years ago
Bai	05d40a5255	fix: 修复平台列表创建同名校验问题	2 years ago
Jiangjie.Bai	0a374db606	fix: 修复文件导出 {"": True"} 问题 (#9729)	2 years ago
ibuler	1a9cd2dee2	perf: 优化资产批量更新	2 years ago
ibuler	d1b807bd8b	perf: 修改 account asset auto_info 返回	2 years ago
fit2bot	b9dcce5c51	fix: 资产更新没有账号及自动化任务更新name (#9679) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	82432299b8	merge: with dev	2 years ago
ibuler	0001ffba1b	perf: 优化 rbac	2 years ago
Bai	1888597451	fix: 修改slugfield校验问题	2 years ago
Bai	d246b9bb35	fix: 修复资产硬件信息收集失败的问题	2 years ago
ibuler	492dd34cb8	perf: 优化排序	2 years ago
ibuler	a1440ee4e0	perf: 优化 asset 创建时 nodes 可能有问题	2 years ago
fit2bot	9ed1b8fc86	perf: 修改 swagger 查询 (#9616) ... * perf: 修改 swagger 查询 * perf: 修改 operate log --------- Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
fit2bot	9a62a7aaab	pref: 修改 activity log (#9571) ... * pref: 修改 activity log * perf: 优化 acitivity * pref: 修改 activity * fix: 修复一些运行问题 * fix: app.py 中添加 tasks import * fix: 添加 activity_callback * fix: 添加 execute_account_backup_plan activity_callback * fix: 添加 activity_callback -> gather_asset_accounts * fix: 对 celery 任务添加 activity_callback 回调 * fix: 修改翻译 --------- Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com> Co-authored-by: Bai <baijiangjie@gmail.com>	2 years ago
jiangweidong	3b3355f3f8	perf: 修改PostgreSQL数据库参数为必填	2 years ago
fit2bot	e66168dfa4	perf: account secret 加密 (#9570) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
Bai	e25306608b	fix: 修复克隆网关没有克隆账号的问题	2 years ago
ibuler	786d96ee6e	perf: 修改登录	2 years ago
ibuler	8b0a967306	perf: 优化 audit log	2 years ago
fit2bot	10d776f7e5	perf: account name required (#9533) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	bd9b1f1a5b	perf: 优化 audit log	2 years ago
ibuler	136bec94ca	perf: merge with dev	2 years ago
Bai	4c96d6935a	fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送	2 years ago
ibuler	37a52c420f	perf: 优化并发处理	2 years ago
Bai	4f6a17290a	fix: 修复创建资产时账号禁用不生效的问题	2 years ago
ibuler	eabb41b74c	perf: 修改 platform serializer	2 years ago
Bai	b41d30dbac	fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验)	2 years ago
fit2bot	654cbe7bd0	perf: 创建网关 没有关联网域 (#9441) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
fit2bot	9a1109e13d	perf: 资产创建添加账号 没有携带密码 (#9436) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
Bai	4af80bfcdf	fix: 修改中文翻译文件	2 years ago
ibuler	91357b3715	perf: 优化 gateway 设置	2 years ago
fit2bot	20d2efc407	perf: 主机硬件信息 (#9429) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	470d2703f4	perf: 协议端口校验	2 years ago
fit2bot	93932f1904	perf: 优化批量更新 (#9418) ... * perf: 优化批量更新 * perf: 优化代码，减少 80%，依然可用 --------- Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
Bai	5fcd83b587	fix: 修复获取 swagger api 时，AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题	2 years ago
ibuler	853f9c422d	perf: 修改 i18n	2 years ago
fit2bot	66c58a2084	perf: 账号 模版创建 (#9386) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
ibuler	9ec7a8ac61	perf: 优化 asset info	2 years ago
老广	685b99e04d	Merge pull request #9366 from jumpserver/pr@dev@fix_no_db_name_mongodb_task_err ... fix: mongodb无指定数据库时，一些自动化任务会失败	2 years ago
jiangweidong	87ca9cb11d	fix: 使用type	2 years ago
fit2bot	f18f2df4ab	perf: account template secret (#9368) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
jiangweidong	c34b7e69eb	fix: mongodb无指定数据库时，一些自动化任务会失败	2 years ago
Bai	f6da14b80d	fix: 修复网域导入500问题(不支持修改gateways)	2 years ago
fit2bot	da915249ab	perf: su_method allow_null (#9352) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
fit2bot	f8ac83d5c7	fix: change secret trigger 必填 (#9333) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
fit2bot	56d533c802	v3.0.0-rc1 (#9322) ... * perf：automation * pref: 修改账号推送 * perf: 修改 assets * perf: 修改 accounts * feat: 优化代码 * fix: 修复 ObjectRelatedField 获取 value attr 时先判断是否有 attr 属性 * perf: 增加翻译 * feat: 增加部分翻译 * feat: 去除无用列 * perf: ticket remove app * fix: 修复创建账号备份任务失败的问题 * perf: 添加 accounts app * perf: ticket type serializer (#9252) Co-authored-by: feng <1304903146@qq.com> * perf: ticket * perf: 修改 accounts api * perf: 优化 AssetPermissionSerializer fields 顺序 * perf: 修改 accounts * feat: 限制常用用户名api返回长度 * feat: 限制常用用户名api返回长度 * perf: 修改 LoginAssetACL 序列类，增加 users_username_group, accounts_username_group... 字段 * perf: 修改 CommandFilterACLSerializer 增加 command_groups_amount 字段 * perf: 修改rbac API啥的 (#9254) * perf: migrate * perf: 修改 AssetPermedSerializer domain 字段类型 * perf: 放开push account 权限位 * perf: 修改 accounts * perf: 修改 LoginACLSerializer 字段类型 * pref: 修改数据库 migrations * perf: filter asset systemuser * perf: 修改 SessionSerializer 字段类型 * pref: 修改 applet host * perf: 修改 SessionCommandSerializer 字段类型 * perf: 修改 accounts import * perf: 修改 celery datetime * perf: 修改 asset serializer * pref: 修改 labeled field * feat: 修改翻译 * perf: 修改 JobSerializer 字段类型 * feat: 支持使用 ws 发送终断任务 * perf: add AccessTokenAuthentication * perf: 修改 BaseStorageSerializer 字段类型 * perf: 修改 AppletHostSerializer 字段类型 * perf: signal event * perf: asset types automations (#9259) Co-authored-by: feng <1304903146@qq.com> * perf: 修改下载 rdp 文件时返回的 address 地址信息为空的问题 * perf: 修改 AssetSerializer.accounts.secret 为 write_only; 修改 DomainWithGatewaySerializer.gateways 返回 account 信息及 secret 字段; * perf: automation 干库 (#9260) Co-authored-by: feng <1304903146@qq.com> * perf: account push api * feat: 修改迁移文件 * feat: 删除无用代码 * feat: 优化部分资源无操作日志 * perf: 修改 account * perf: perm tree * perf: asset serializers retrieve * perf: 格式化代码 * perf: AutomationExecution (#9268) Co-authored-by: feng <1304903146@qq.com> * perf: AssetDetailSerializer 和 Asset Model 添加 specific_info 字段; * perf: 修改账号推送 * feat: handle ws heartbeat status * perf: k8s tree (#9269) Co-authored-by: feng <1304903146@qq.com> * perf: 修改账号推送 * perf: 修改 asset detail serializer * fix: 修复 windows 不能运行 powershell 命令的问题 * feat: 支持按照资源时间线查看操作活动 * feat: 翻译 * feat: 优化操作日志 * perf: asset clone * fix: 错误的修改改回去 * perf: create asset account * feat: 增加task 刷新续传功能 * fix: applet host deloypment filter host * perf: 修改了 common 结构，和 push accounts * perf: 整理 common 结构 * perf: 修改 const import * perf: 修改 allow bulk destroy * fix: applet host search fileds * perf: applet bulk delete * fix: applet list 404 * perf: 修改 common view * feat: 增加一些翻译, 修复 playbook 上传的错误 * fix: 修改错别字 * perf: 修改 applets status * perf: 修改网关 api * perf: automateion (#9281) Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> * perf: 失效 connect methods 当 applet 删除 或者 host 删除 * perf: 网关账号的密码类型改成 LabelField * perf: chrome applet script * perf: verify code ttl (#9282) Co-authored-by: feng <1304903146@qq.com> * perf: database ping * perf: ws * perf: 修改网关创建 * perf: account task org (#9285) Co-authored-by: feng <1304903146@qq.com> * perf: asset test api * perf: port 添加 account * pref: 修改 db mapper permission * fix: db port mapper list api * perf: account change secret (#9286) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 setup_eager_loading * perf: SecretStrategy * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * pref: web database 信号转发 * perf: account push automation * perf: push filter account * perf: 修改 publish 版本 * perf: 修改网关 * fix: 修改资产 Specific 信息中 JSONField 字段返回 json.loads 对象 * feat: 远程应用内置Navicat Premium 16 * feat: 更新下载链接 * feat: 整理代码格式 * perf: 修改 terminal point * perf: update chrome applet script * fix: 资产 specific 获取 JSONField 时, 判断值的类型不为 list, dict * perf: domain (#9292) Co-authored-by: feng <1304903146@qq.com> * perf: 优化 endpoint 监听端口，仅 oracle 动态 * perf: 修改翻译 * perf: 修改文案 * perf: 修改缺失的翻译 * perf: 修改 endpoint help text * feat: 还原格式 * feat: 去掉基类 * feat: 增加特权账号字段 * perf: decode content * fix: check pid * perf: 修改 smart endpoint * perf: 修改 endpoint mysql default port * feat: 优化 * perf: 修改 endpoint mysql default port * perf: gateway test (#9295) Co-authored-by: feng <1304903146@qq.com> * perf: migrate * perf: 修改 endpoint mysql default port * fix: 修复获取任务执行结果死循环 * feat: 作业审计日志增加字段 * fix: add on_transaction_commit task post save * perf: gateway (#9297) Co-authored-by: feng <1304903146@qq.com> * feat: 过滤 jumpserver 自动产生的用户 * fix: 修复ops节点选择的问题 * fix: 修改 统一 connection-token 和 command 的 review API 返回数据 from_ticket_info * perf: change secret (#9298) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 db port manager * perf: 修改 db port manager * perf: add celery log mark * perf: remove debug log data * fix: navicat use manual type * fix: remove navicate download url * perf: push_account_enabled (#9301) Co-authored-by: feng <1304903146@qq.com> * fix: 修改navicat启动程序MD5值 * perf: push account (#9303) Co-authored-by: feng <1304903146@qq.com> * feat: Redis/MongoDB 支持SSL * fix: 修改授权规则过滤字段 node_name,node_id; 修复获取授权节点下的资产为空的问题; * perf: push account button (#9305) Co-authored-by: feng <1304903146@qq.com> * perf: account push * fix: 修复获取 /user//assets/tree/ 返回用户授权的所有资产 * perf: asset ping (#9307) Co-authored-by: feng <1304903146@qq.com> * perf: asset enabled_info * perf: 优化activity记录都保存至operatelog中 * feat: 远程应用navicat支持试用版连接 * perf: 优化迁移文件 * perf: 修改资产列表 API category type 字段 choices 根据 category 进行返回 * fix * perf: 修改账号列表 API 解决根据 node_id asset_id 搜索账号列表无效的问题 * fix: navicat dba账号登录 * perf: 优化navicat连接 * perf: 修改账号列表 Model Manager 继承自 OrgManager，解决组织过滤问题 * perf: 修改账号列表 Filter 支持根据 platform,category,type 字段搜索 * perf: change secret email (#9312) Co-authored-by: feng <1304903146@qq.com> * feat: 保证认证信息一定清理 * perf: add mariadb * perf: 修改资产类型树数量统计资产或账号 * perf: applet chrome quit * perf: 优化关闭欢迎页面 * fix * perf: executed amount * perf: 修改 built-in applet installation * perf: 修改资产列表增加标签搜索 * perf: 修改资产列表增加标签搜索 * perf: account task automation (#9319) Co-authored-by: feng <1304903146@qq.com> * perf: account trigger * perf: 修改系统设置文案：批量命令执行 -> 作业中心 * perf: 优化migrate (#9320) Co-authored-by: feng <1304903146@qq.com> * perf: 修改资产节点树 API，支持搜索资产、节点 * perf: audit dashboard (#9321) Co-authored-by: feng <1304903146@qq.com> * fix: 修改 has_perm 权限判断兼容 list 和 str 类型 * perf: 修改一些换行 * perf: 修改 ansible config * fix: oracle依赖文件地址错误 (#9324) * perf: ansible mudules * perf: 修改 runner host cwd Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Aaron3S <chenyang@fit2cloud.com> Co-authored-by: Bai <baijiangjie@gmail.com> Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> Co-authored-by: Eric <xplzv@126.com> Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com> Co-authored-by: jiangweidong <80373698+Hi-JWD@users.noreply.github.com>	2 years ago
Bai	52b5c8beee	fix: 删除 AssetSerializer 中 enabled_info 字段 (已放到 AssetDetailSerializer 中).	2 years ago
feng	ccc766df8d	perf: account source	2 years ago
fit2bot	c81f36cc27	perf: remove gather model (#9246) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
Bai	0328fd1bb0	merge: v3	2 years ago
ibuler	1b9aad594c	perf: remove push account	2 years ago
ibuler	411d199e18	perf: 修改 asset serializer	2 years ago
Bai	825bea5ea5	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2 years ago
Bai	ba9123b1c4	perf: 修改资产序列类字段翻译	2 years ago
ibuler	3da9efc3fd	perf: 修改账号推送	2 years ago
ibuler	3145582f0b	perf: 修改 accounts	2 years ago
ibuler	17627390f8	perf: 修改 account 序列号字段	2 years ago
Eric	d60f9a7c69	perf: web selector 默认值修改	2 years ago
feng	408c6c568a	perf: account backup	2 years ago
Bai	8beb1b81cf	fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类	2 years ago
Bai	66bdc375df	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2 years ago
Bai	58131a2b68	fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题； ... 修改原因: 前端使用 Select2 组件渲染更新账号的表单页面时，会默认先创建 spm 值， 后端调用 get_object 方法时，使用的queryset，就是spm所对应的queryset， 而 detail=True， 查询的值是当前 account_id，不在 queryset 中， 所以会导致调用父类的 get_object 方法报错，对象找不到	2 years ago
ibuler	0c7de50708	perf: 修改 display field	2 years ago
ibuler	6a1c5aba12	perf: 修改一些翻译	2 years ago
Bai	6233e2b3de	perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty	2 years ago
Bai	29fd6ee8c9	perf: Account su_from 返回使用 ObjectRelatedField	2 years ago
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>	2 years ago
ibuler	e91cbb9c97	merge: with v3	2 years ago
feng	03e62b5bc1	perf: asset mini	2 years ago