github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
11,389 Commits
68 Branches
248 Tags
109 MiB
Commit Graph

7679 Commits (1d6f827296b881e9b2dc4d034cc9cd40df3cdc12)

Author SHA1 Message Date
Aaron3S 6a12bc39e9 feat: ansible receptor 适配文件上传 2024-04-11 22:22:29 +08:00
Bai 3f67b40975 fix: Export excel file can running instructions(csv no need deal) 2024-04-11 20:37:17 +08:00
fit2bot 0adc854721
perf: 优化审计台命令记录代码 (#12998) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 18:32:00 +08:00
fit2bot ab76745a9f
perf: 优化审计台仪表盘命令记录总数统计数据库和所有es数据 (#12997) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 18:29:02 +08:00
Aaron3S 574639d5e1 feat: 支持 ansible receptor private 方式认证, 支持运行完成工作空间清理 2024-04-11 17:51:22 +08:00
fit2bot fa5d9d3df4
fix: 二级审批通过，一级审批人员查看不到工单 (#12993) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-11 16:35:00 +08:00
wangruidong 94b5d8b9e9 perf: 处理停止任务异常情况 2024-04-11 14:25:40 +08:00
Bai bffc9f4b1d fix: Fix session Duration label 2024-04-11 11:00:46 +08:00
wangruidong 6b5d18222e fix: 全局组织-组织角色用户数量不对 2024-04-10 18:20:05 +08:00
Aaron3S 2b05fd5276 fix: 修复 ansible receptor playbook 无法执行的问题 2024-04-10 18:18:32 +08:00
fit2bot 3e46d72ba3
fix: 修复lark登录 Backend错误问题 (#12981) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-10 17:07:48 +08:00
feng 6502adb772 perf: 切换zh hant 2024-04-10 14:39:58 +08:00
fit2bot a8112c86e3
feat: 全面修改 ansible 执行方式为 receptor (#12975) 
* feat: 修复 receptor kill job  的问题

* feat: 全面修改 ansible 执行方式为 receptor

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2024-04-10 11:35:38 +08:00
wangruidong 8911c9c649 fix: Luna引导下载版本更新 2024-04-09 20:10:30 +08:00
Bai 3b70b4cf9e feat: LDAP User Auth support cache user_dn 2024-04-09 20:09:50 +08:00
wangruidong 1e0ea3905e fix: 忘记密码短信验证码过期 2024-04-09 20:05:34 +08:00
ibuler 85cb80cbfe perf: remove gpt category 2024-04-09 18:43:06 +08:00
fit2bot 79f8480ae4
perf: core celery 不做报警 (#12970) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-09 17:07:48 +08:00
Bai dec502e025 perf: Update user orgs roles 2024-04-09 16:52:11 +08:00
Aaron3S c7b5cc7d89 feat: 暂时注释ansible runner write pid 逻辑 2024-04-09 16:46:56 +08:00
Aaron3S bc76ce50e1 feat: 修改 receptor 启动参数 2024-04-09 15:59:14 +08:00
Bai be90bf6b28 perf: Update user orgs roles 2024-04-09 15:43:27 +08:00
hzhfit2cloud dfa68d1ca8 支持中文繁体 2024-04-09 15:18:36 +08:00
hzhfit2cloud 0237edf6c1 支持中文繁体 2024-04-09 15:18:36 +08:00
ibuler f0e87ef3f8 perf: rdp token 复用 
perf: connection token
 2024-04-08 19:03:47 +08:00
fit2bot cd19a276c9
fix: 修复工单申请人过滤问题 (#12957) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-08 18:56:59 +08:00
jiangweidong 5ea4bba676 perf: 优化资产修改激活状态记录操作日志 2024-04-08 18:52:46 +08:00
Bryan 2530827d07
Revert "feat: 支持中文繁体" 2024-04-08 18:04:38 +08:00
Bryan 3456e9ac5b
Merge branch 'dev' into dev 2024-04-08 18:01:55 +08:00
fit2bot 689f858f97
feat: 支持 ansible 沙盒运行 (#12953) 
* feat: 支持 ansible 沙盒运行

* feat: 修改 receptor sock 默认路径

* feat: 增加 adhoc 执行命令的 local connection 权限

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2024-04-08 17:54:34 +08:00
wangruidong e61f9efbf2 perf: 内置平台置顶 2024-04-08 16:33:44 +08:00
ibuler 97f60a61e0 perf: 修改翻译 2024-04-08 14:32:14 +08:00
Bai 45bac09dc7 perf: ROOT Org show orgs-and-roles in user-detail page 2024-04-08 14:00:57 +08:00
Eddie 989a970a7c
簡轉繁 2024-04-07 10:57:48 +00:00
Eddie 0296df0480
簡轉繁 2024-04-07 10:31:04 +00:00
wangruidong 9776d35140 perf: 批量上传添加权限校验 2024-04-07 15:49:41 +08:00
fit2bot 0aeea414f5
fix: 支持 SSO 用户登录时校验 (#12923) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-07 14:57:38 +08:00
Bai 9817154234 perf: 优化所有View默认排序规则(name) 2024-04-03 19:10:34 +08:00
Bai 39ae14877b perf: 优化所有View默认排序规则(name) 2024-04-03 18:33:00 +08:00
Bai 9c238a9147 perf: 优化所有View默认排序规则(name) 2024-04-03 18:12:15 +08:00
fit2bot 42d7e983e4
perf: 翻译 (#12937) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-03 16:53:08 +08:00
fit2bot 611d0b71e8
fix: 修复用户下线失败问题 SESSION_EXPIRE_AT_BROWSER_CLOSE 可配置 (#12936) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-03 16:41:37 +08:00
Bai d78d55091c fix: 修复过滤用户组织角色不生效的问题 2024-04-03 15:52:52 +08:00
ibuler 3b8aab8c25 perf: 修改 export 使用的 serializer 2024-04-02 19:15:48 +08:00
Eric 2f16bdc4be perf: 优化针对低版本 ssh 版本的任务 2024-04-02 19:01:21 +08:00
wangruidong 22d70eb416 fix: 华为交换机执行快捷命令报错 2024-04-02 18:48:40 +08:00
wangruidong afa1ba4f6b fix: 统一成模板 2024-04-02 17:21:47 +08:00
ibuler 39d3e5477c perf: migrate label model with the id 2024-04-02 16:47:38 +08:00
ibuler 255817f5c6 perf: 修改翻译 2024-04-02 14:27:18 +08:00
ibuler 40db6485dd perf: change i18n 2024-04-01 19:28:08 +08:00
fit2bot d499b94e04
fix: gpt 配置取消长度限制 (#12907) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-29 18:53:24 +08:00
fit2bot 7a6468530f
fix: 修复测试rdp资产可连接性时使用的python解释器路径不对问题 (#12902) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-29 16:09:42 +08:00
ibuler 56193f833f perf: change some translation 2024-03-29 15:29:04 +08:00
fit2bot 02893c2a2b
perf: 翻译 (#12899) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-29 15:18:54 +08:00
Eric 4470b68de9 perf: 优化代码，避免录像下载异常 2024-03-29 11:37:47 +08:00
wangruidong d3d89b0853 perf: 去掉工单重新打开状态 2024-03-29 11:06:51 +08:00
wangruidong 681cecc52b perf: 优化所有资源列表的默认排序规则 2024-03-29 10:48:54 +08:00
feng bca0863952 fix: 【标签】标签绑定资源api需校验正确的uuid 2024-03-28 18:43:00 +08:00
fit2bot bf1a29fac2
fix: 修改content type 权限 (#12890) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-28 15:22:26 +08:00
wangruidong 47ceaf967c fix: 查看作业命令任务执行结果添加用户隔离 2024-03-28 14:42:08 +08:00
feng 00c5b3c0a2 fix: 【资产登录】属性为标签时，规则不生效 2024-03-28 14:36:17 +08:00
ibuler f224dc241e perf: 修改翻译 2024-03-28 14:31:27 +08:00
ibuler c22f88ae42 perf: 修改翻译 2024-03-27 17:50:44 +08:00
fit2bot 3aeadc2f03
fix: 修复收藏文件夹中的资产时不时莫名的丢失 (#12886) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-27 16:04:16 +08:00
wangruidong f0cbd77310 perf: 优化资产、网域、网关的操作体验 2024-03-27 16:02:08 +08:00
fit2bot f11852c60d
perf: lark logo (#12878) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-26 17:46:16 +08:00
feng 8b870678df perf: 翻译 2024-03-26 17:34:27 +08:00
feng 470a088a9f feat: 拆分 feishu lark 2024-03-26 17:10:25 +08:00
jiangweidong ccd4f3ada4 fix: tcpdump想捕捉所有ip时，空ip被解析成0.0.0.0，导致捕捉不到的问题 2024-03-22 17:31:03 +08:00
ibuler ae7a562b85 fix: ansible playbook render and run in localhost 2024-03-22 17:06:19 +08:00
wangruidong be6d8566da perf: 去掉enabled字段默认值 2024-03-22 16:02:25 +08:00
ibuler f6e4d909ff Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-03-22 10:17:36 +08:00
ibuler 6c0299b05a perf: 优化语言更改 2024-03-21 19:13:00 +08:00
wangruidong f264bf03ff feat: 支持开启、关闭定时任务执行 2024-03-21 18:23:41 +08:00
fit2bot 02c2ee8c54
perf: 登录界面文案优化 (#12849) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-21 16:21:44 +08:00
Eric d71374ca8a perf: 优化代码 2024-03-21 16:08:34 +08:00
Eric 0589f7fe33 perf: 支持发布机卸载远程应用 2024-03-21 16:08:34 +08:00
fit2bot a5e8792092
perf: 翻译 (#12847) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-21 11:32:23 +08:00
fit2bot 15acfe84b0
perf: 改密记录可查看密文 (#12821) 
* perf: 改密记录可查看密文

* perf: 自动化任务错误处理

* feat: 改密记录可批量重试 新增更多过滤选项

* perf: 改密任务失败添加消息通知

---------

Co-authored-by: feng <1304903146@qq.com>
 2024-03-21 11:05:04 +08:00
jiangweidong 08b483140c fix: 解决FTP审计文件无法清理的问题 2024-03-20 19:06:30 +08:00
Bai cf1e048328 perf: 优化 Session 支持 duration 字段 2024-03-20 15:51:33 +08:00
Bai fb02095568 perf: Remove settigns.LITE 2024-03-19 19:22:29 +08:00
ibuler 5e104a3dd2 perf: 修改翻译 2024-03-19 17:53:29 +08:00
wangruidong a6228f145d fix: 作业命令用户隔离执行 2024-03-19 11:25:46 +08:00
ibuler b6ab3df038 perf: 优化 celery task log 权限控制 2024-03-18 19:00:04 +08:00
ibuler e9f591b33b perf: 优化 ops task 2024-03-18 18:54:48 +08:00
wangruidong 90d4914280 perf: 删除job-execution/asset-detail接口 2024-03-18 18:54:27 +08:00
wangruidong 80a506e99f perf:LDAP报错信息不对 2024-03-18 15:56:57 +08:00
Eric d8a891a7d7 perf: 支持发布机仅初始化配置 2024-03-18 15:52:42 +08:00
wangruidong d71c41e384 perf: 提高短信发送任务优先级 2024-03-18 15:50:00 +08:00
fit2bot bb27ff7f8a
fix: 批量上传文件关闭作业中心配置后上传会报错 (#12814) 
* fix: 批量上传文件关闭作业中心配置后上传会报错

* fix: format

---------

Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2024-03-18 15:49:13 +08:00
wangruidong 0671e56d65 fix: Another user can use this job id to spoof both the file name and 
its contents
 2024-03-18 14:22:17 +08:00
ibuler d04ac09e82 perf: 修改 groups api 2024-03-15 19:18:49 +08:00
feng 73a4ce0943 perf: 优化user secret key 处理逻辑 2024-03-15 11:39:59 +08:00
fit2bot 902fac61e9
perf: playbook api 去掉多余的rbac_perms (#12813) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-14 14:27:31 +08:00
wangruidong dcd7f9f7e6 perf: 支持终断批量快捷命令执行的任务 2024-03-14 14:20:47 +08:00
Bai 80035e7cb6 fix: 修复 Playbook 脚本文件问题 2024-03-14 10:26:30 +08:00
Eric e2d14f5e4b perf: 支持 razor 的监控 2024-03-13 19:36:26 +08:00
ibuler cae9f03892 perf: 修改 platform 翻译 2024-03-13 18:40:35 +08:00
ibuler 72362274ce perf: 优化 console_orgs 的选择问题 2024-03-13 10:58:30 +08:00
feng cfb1d306a3 perf: 优化user session 逻辑 2024-03-13 10:58:03 +08:00
ibuler bffcd6107c perf: 修改翻译 2024-03-12 18:47:44 +08:00
wangruidong e5cb99d682 perf: 登录页面排版优化 2024-03-12 17:05:03 +08:00
ibuler 056e0c816b perf: 修改翻译 2024-03-12 17:04:26 +08:00
fit2bot cbd812ab5f
feat: 自定义footer (#12795) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-03-12 14:36:20 +08:00
ibuler ea67312877 perf: 修改翻译 2024-03-11 19:20:18 +08:00
Bai d0117b5a91 perf: 优化邮箱校验逻辑 2024-03-11 18:41:50 +08:00
jiangweidong afe3777895 perf: 减少一次邮箱的判断 2024-03-11 18:41:50 +08:00
jiangweidong e45676edc4 perf: 优化获取邮箱后缀代码位置 2024-03-11 18:41:50 +08:00
jiangweidong 60e4b19d07 perf: 优化三方登录创建的用户邮箱会校验，非法邮箱会重置成默认格式 2024-03-11 18:41:50 +08:00
Bai 86d76c53d6 perf: 优化 MongoDB 数据库支持 authSource 认证数据库配置 2024-03-11 18:27:57 +08:00
fit2bot b50f1a662d
fix: 优化手动输入的账号username遵循登录资产的ACL控制 (#12774) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-11 15:10:51 +08:00
fit2bot b3e4c10bc2
perf: 用户个人设置操作记录翻译 (#12788) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-11 15:10:15 +08:00
ibuler 327cdc8604 perf: 修改翻译 2024-03-11 14:33:14 +08:00
wangruidong 6de524c797 perf: 不满足自动登录勾选条件时从禁用修改为隐藏 2024-03-08 18:35:18 +08:00
Bai 2e067a7950 perf: 优化升级 django-celery-beat==2.6.0; 删除之前修复的 celery-beat 的代码 2024-03-08 17:47:07 +08:00
fit2bot a3658136e2
feat: 支持配置资产连接默认打开方式 (#12781) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-08 10:47:18 +08:00
ibuler 6f37cc4d01 merge: with remote 2024-03-07 18:36:03 +08:00
ibuler 003dd49ed6 perf: 修改翻译 2024-03-07 18:33:13 +08:00
Bai 46d57f02e7 perf: i18n settings-systemtask done. 2024-03-07 17:29:03 +08:00
Bai 30915a93e5 perf: i18n settings-tools done. 2024-03-07 16:15:09 +08:00
Bryan b9422c096e
fix: 修复连接 Token 时报错的问题((1139, "Got error empty (sub)expression from regexp")) (#12768) 2024-03-07 12:37:33 +08:00
fit2bot b3e73605b0
perf: 创建网域时资产不用必选 (#12766) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-07 11:20:40 +08:00
Bai c64480dc33 perf: i18n settings-Interface not done. 2024-03-06 17:49:42 +08:00
ibuler 4a9b1aff96 Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-03-06 17:08:31 +08:00
ibuler 542e94ec9c perf: 修改翻译 2024-03-06 17:08:24 +08:00
fit2bot 9341558f61
perf: translate (#12764) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-06 16:51:07 +08:00
fit2bot 6c89349194
perf: 优化会话 命令记录 分片删除 (#12763) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-06 15:22:55 +08:00
jiangweidong 670eac49b6 perf: 优化oauth2登录未激活用户时，会重复跳转登录问题 2024-03-06 15:03:58 +08:00
feng a7a099f290 perf: 支持配置文件配置限制的最大数量 2024-03-06 14:53:48 +08:00
feng 5157514c62 perf: 优化会话清理任务使用分片删除过期的会话和命令 2024-03-06 14:50:19 +08:00
jiangweidong 533d2ab98a perf: 优化自定义短信测试总是成功的问题 2024-03-06 14:32:58 +08:00
ibuler 6ea13b2c0d perf: 修改翻译 2024-03-05 19:01:44 +08:00
wangruidong 40730b741d fix: 个别页面搜索不生效的问题 2024-03-05 11:21:20 +08:00
ibuler e57512f4fe perf: 添加配置支持 Lite 2024-03-04 19:18:26 +08:00
ibuler 348f67f4a4 Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-03-04 15:46:18 +08:00
ibuler 83bdf07600 perf: 修改翻译 2024-03-04 15:42:14 +08:00
fit2bot dfe4eddbbc
perf: translate (#12746) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-03-04 14:44:19 +08:00
ibuler 1caed59f76 merge: with remote 2024-03-04 14:03:05 +08:00
halo 786cb23f98 perf: 优化ansible_winrm执行超时时间 2024-03-01 17:02:48 +08:00
fit2bot 133daeb664
perf: translate (#12739) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-01 15:42:21 +08:00
fit2bot 518ae3fa09
perf: 自动化资产探活支持Telnet方式 (#12728) 
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2024-03-01 15:05:34 +08:00
ibuler 18707d365b perf: 优化标签搜索资产使用的关系 2024-03-01 15:05:01 +08:00
wangruidong a4a8d1ecf0 perf: modify menu translate 2024-03-01 13:53:29 +08:00
feng f0ffa2408d fix: 哨兵redis 密码里有@ 无法连接 2024-02-29 16:19:33 +08:00
jiangweidong b557e264bc fix: 账号备份选择SFTP有多个时，重复编码password会导致任务异常 2024-02-29 16:10:21 +08:00
ibuler 88a08a74f7 perf: 修改翻译 2024-02-29 14:57:38 +08:00
wangruidong 457d2b2359 fix: 作业管理资产根据标签过滤获取不对 2024-02-28 15:50:46 +05:00
feng c9e12a3027 perf: Modify some translations 2024-02-28 18:23:10 +08:00
fit2bot 82aa4a65ab
perf: account translate (#12723) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-02-28 17:32:29 +08:00
ibuler d46237f1bf merge: with remote 2024-02-28 16:32:46 +08:00
ibuler 1744f94910 perf: 修改翻译 2024-02-28 16:27:41 +08:00
wangruidong e71e335f5c fix: 终断任务时接口报错 2024-02-27 16:22:06 +05:00
Bai e308812429 perf: i18n settings-Security done. 2024-02-27 19:20:48 +08:00
fit2bot 2328ef0b0c
perf: account translate (#12719) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-27 19:17:40 +08:00
Bai 000c5770f2 perf: i18n settings-RemoteApp done. 2024-02-27 17:13:59 +08:00
Bai 9e1a3598ab perf: i18n settings-Components done. 2024-02-27 16:43:44 +08:00
Bai 7268f60343 perf: i18n settings-Storage done. 2024-02-27 14:59:22 +08:00
Bai c8b274031f perf: i18n settings-Auth done. 2024-02-27 11:25:42 +08:00
wangruidong 889cdca3b0 fix: 操作日志资源类型搜索无效 2024-02-26 16:36:05 +05:00
wangruidong 4cfd1bc047 fix: 远程应用列表接口报错 2024-02-26 16:03:34 +05:00
Eric fc0891ceee perf: 会话生命周期日志翻译 2024-02-26 15:33:11 +05:00
feng cea16fc41f perf: 命令上传 取消input长度限制 2024-02-26 14:29:13 +05:00
fit2bot 4b7c0b8437 perf: 用户列表翻译超级管理员，组织管理员 2024-02-26 14:27:19 +05:00
Bai 10394dbb1c perf: i18n settings-Auth done. 2024-02-26 16:53:40 +08:00
Bai 859bb91fc7 perf: i18n settings-Features done. 2024-02-26 15:47:05 +08:00
fit2bot 09432b01a7
fix: 自动化任务密钥为 None 报错 (#12709) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-26 14:47:19 +08:00
wangruidong d7f8ba58ad perf: 作业日志添加任务类型 2024-02-26 13:43:49 +08:00
fit2bot 0fd0d33704
perf: i18n settings-notifications done. (#12702) 
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: Bryan <jiangjie.bai@fit2cloud.com>
 2024-02-23 18:09:18 +08:00
fit2bot ad0f489834
perf: translate (#12701) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-23 17:52:16 +08:00
fit2bot b1fa870de7
perf: 工作台相关翻译 (#12700) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-02-23 17:22:47 +08:00
Bai 7c5e2ae8ea perf: i18n settings-org done. 2024-02-23 15:17:17 +08:00
Bai c0e4065a45 perf: i18n settings-basic done. 2024-02-23 14:31:09 +08:00
fit2bot 35448eea9f
perf: 翻译 (#12690) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-22 17:46:12 +08:00
wangruidong edf0630cef fix: 用户列表导出优化 2024-02-22 17:44:56 +08:00
wangruidong 430f45a3ec perf: permissions i18n modify 2024-02-22 17:36:45 +08:00
Bai 71b6fd5326 perf: 修改翻译 2024-02-22 17:29:46 +08:00
wangruidong c4342567ba fix: 远程应用README国际化 2024-02-22 16:11:43 +08:00
fit2bot d4e53be7ce
perf: 修改core celery 组件状态 (#12684) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-22 14:47:26 +08:00
wangruidong d4721e90d5 fix: LDAP用户导入会超时 2024-02-22 11:37:30 +08:00
wangruidong 251db733b2 perf: i18n modify 2024-02-22 10:30:15 +08:00
fit2bot 753ab77c46
perf: 关闭页面等待ws的最大重连时间改为6秒 (#12677) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-21 17:51:06 +08:00
jiangweidong ba127c506d feat: 支持工单链接直接免密审批 2024-02-21 11:39:01 +08:00
ibuler d799725b8a perf: 修改翻译 2024-02-20 19:01:32 +08:00
fit2bot c21ca70158
perf: 账号收集添加资产名称模糊搜索 (#12673) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-20 18:42:11 +08:00
wangruidong 135fb7c6f9 perf: 终断批量快捷命令执行的任务 2024-02-20 15:09:39 +08:00
feng f592f19b08 perf: 自动化任务按优先级默认排序 2024-02-19 18:19:14 +08:00
fit2bot dce68cd011
perf: 授权用户不显示组件用户 (#12664) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-19 14:48:31 +08:00
fit2bot d7b1903fb7
perf: 修改登录页面定期 check 的时间 (#12660) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-19 10:57:40 +08:00
feng 6e506e3146 fix: 【登录超时】修复登录页面提示 <登录超时，请重新登录> 问题 2024-02-19 10:21:13 +08:00
fit2bot 58d30e7f85
perf: 记录会话活动日志 (#12523) 
* perf: 更新会话生命周期日志

* perf: 优化错误原因

* perf: 增加错误类型

---------

Co-authored-by: Eric <xplzv@126.com>
 2024-02-06 18:28:31 +08:00
ibuler 9d80aed468 perf: 修改一些翻译 2024-02-06 15:51:39 +08:00
wangruidong 2062778ab8 fix: 资产登录未发送提醒 2024-02-06 15:24:41 +08:00
wangruidong eaca296bd0 perf: 支持改密日志记录保留天数 2024-02-05 18:09:45 +08:00
Bai 1051c6af04 fix: 修复用户登录后仪表盘显示403的问题(用户在非Default组织下是组织管理员权限) 2024-02-05 16:52:09 +08:00
ibuler 314e4301f3 perf: 修改翻译 2024-02-05 14:13:07 +08:00
wangruidong aa69353474 perf: 支持远程应用描述文案的国际化 2024-02-05 10:46:47 +08:00
ibuler b284bb60f5 merge: with dev 2024-02-05 09:49:43 +08:00
ibuler f99396ec50 perf: 修改翻译 2024-02-04 19:31:51 +08:00
jiangweidong d1f31f078b perf: 账号支持批量更新 2024-02-04 17:28:31 +08:00
ibuler be80663436 perf: 优化日志显示避免太长 2024-02-04 17:23:37 +08:00
wangruidong 1ae363d6bd perf: MFA认证App支持自定义下载二维码 2024-02-04 17:19:04 +08:00
fit2bot 31b0d345ad
perf: 使用新的钉钉登录接口 (#12635) 
* perf: 暂存

* perf: 使用新的钉钉登录接口

---------

Co-authored-by: halo <wuyihuangw@gmail.com>
 2024-02-04 17:05:11 +08:00
ibuler 886cf6ed1f perf: 暂存 2024-02-04 16:46:33 +08:00
wangruidong f606dd8920 perf: 增加国际电话区号选择 2024-02-04 14:52:15 +08:00
wangruidong 973df0360c fix: 控制台-仪表盘会话用户，资产排名不对 2024-02-04 11:42:58 +08:00
wangruidong f9f1d96674 fix: 资产过期消息提示发送失败 2024-02-04 11:42:15 +08:00
ibuler 74dd6e97a2 perf: 优化翻译 2024-02-04 10:23:54 +08:00
feng 8cb74976e1 perf: 优化用户session 会话过期 2024-02-02 17:52:50 +08:00
fit2bot 46fde2f1aa
perf: 整合翻译 (#12630) 
* stash

* stash

* perf: 整合翻译

* perf: 整理了一遍

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-02-01 16:02:31 +08:00
wangruidong 279109c9a6 perf: 使用winrm协议批量上传文件 2024-01-30 11:12:24 +08:00
jiangweidong 8c7ba4a497 perf: 优化工单审批时间不准确问题 2024-01-29 16:40:03 +08:00
feng 9cc048267b feat: 批量测试账号可连接性 2024-01-29 16:39:24 +08:00
wangruidong 78d0e3f485 perf: 使用winrm协议执行快捷命令 2024-01-29 11:21:30 +08:00
wangruidong 8aefacd7ed perf: 安全模式返回授权的资产 2024-01-25 17:07:37 +08:00
ibuler ef8db68db1 perf: 优化组织刷新资源 2024-01-25 14:48:15 +08:00
fit2bot 00256f86df
perf: OAuth2协议获取token支持配置json或者data (#12602) 
* perf: OAuth2协议获取token支持配置json或者data

* perf: 优化注释

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2024-01-25 14:00:13 +08:00
ibuler 77569c554b perf: 去掉资产查询的默认排序 2024-01-25 13:49:49 +08:00
fit2bot a6bf592046
perf: 翻译 (#12600) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-24 19:50:05 +08:00
Bryan 1dea424104 Revert "fix: 修复 OAuth2 认证时 POST 方式获取 access_token API 使用 json 传递数据" 2024-01-24 18:23:29 +08:00
Bai 1f5554d945 fix: 修复 OAuth2 认证时 POST 方式获取 access_token API 使用 json 传递数据 2024-01-24 16:53:11 +08:00
ibuler 0303408be8 perf: 优化授权树的刷新，同步解决同步异步的问题 2024-01-24 16:44:19 +08:00
fit2bot f5802ace02
fix: oracle 用户是sysdba类型的 改密推送 验证账号可连接性失败 (#12596) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-24 16:39:43 +08:00
fit2bot 8bde45d9dc
perf: 改密添加最后汇总信息 (#12595) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-24 16:20:44 +08:00
ibuler e8bbc44647 perf: 优化授权的资产，速度快 10 倍 2024-01-24 16:00:18 +08:00
ibuler 34aa48d18c fix: 修复定时检测用户是否活跃任务无法执行的问题 2024-01-23 09:29:00 +00:00
fit2bot 503034299e
fix: windows 收集账号 收集失败 (#12583) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-23 11:07:56 +08:00
fit2bot 0c74e92bfb
perf: 优化 labels 在 json field 中的筛选 (#12577) 
* perf: 优化 labels 在 json field 中的筛选

* perf: 修改 labels 搜索

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-01-21 23:36:18 -04:00
wangruidong 3853d0bcc6 fix:绑定的端点Default下载RDP文件中的地址是空的 2024-01-19 10:38:52 +00:00
feng cd0348cca1 perf: 优化任务列表执行时间 性能快了10倍 2024-01-19 10:33:41 +00:00
Eric ce94348d45 perf: ignore some err 2024-01-19 12:56:46 +08:00
Eric f74f8b7d8c perf: 优化 delay_run 执行 2024-01-19 12:56:46 +08:00
Bai dc79346bdc perf: 修复 Count 时没有去重的问题 2024-01-19 12:54:14 +08:00
wangruidong 37a0d831da perf:ldap sync add no user msg 2024-01-18 10:31:53 +00:00
fit2bot 2c2c3eb21a
perf: 翻译 (#12564) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-17 19:18:00 +08:00
fit2bot 18681d1f50
perf: 连接k8s 添加错误处理 (#12563) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-17 18:41:29 +08:00
feng 86ef984c02 perf: 查看授权用户 不展示组件用户 2024-01-17 03:13:39 -07:00
feng e4d8ce097a fix: 创建资产失败 2024-01-17 18:05:30 +08:00
Eric ae68241812 perf: 修复录像在线播放问题 2024-01-17 00:02:00 -07:00
fit2bot e2a3c360ea
perf: 修改一次性翻译长度 (#12557) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-17 11:38:58 +08:00
fit2bot 9968617758
perf: 修改优化结构 (#12554) 
* perf: 修改优化结构

* perf: 修改结构

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-01-17 11:08:39 +08:00
feng 13d4177531 fix: 工单批量更新没有权限 2024-01-16 20:01:36 -07:00
feng 1cec27ed70 perf: 添加进度条 2024-01-17 10:36:45 +08:00
feng 641e75a905 fix: 用户组列表 用户数量不准确 2024-01-16 02:19:36 -07:00
feng f0dfff0625 feat: gpt translate 2024-01-16 16:19:37 +08:00
ibuler a2d6e41816 perf: labels getter and setter for inherite model 2024-01-16 15:00:46 +08:00
wangruidong 6cd3672604 fix: sync LDAP notification error 2024-01-15 23:08:55 -07:00
fit2bot e29e51121d
perf: 优化账号版本计算策略 (#12547) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-16 11:33:21 +08:00
ibuler fabee37e9e fix: user permed type tree recurse root node 2024-01-15 19:50:14 +08:00
ibuler 2994ea6f68 perf: revert asset labels api 2024-01-15 19:49:55 +08:00
fit2bot fdaec3c959
perf: Modify i18n for settings module. (#12543) 
Co-authored-by: Bai <baijiangjie@gmail.com>
 2024-01-15 04:41:50 -07:00
ibuler fcb4c6a972 perf: Add sort json script 2024-01-15 17:12:13 +08:00
ibuler 513974bbed perf: remove some category 2024-01-15 16:38:16 +08:00
halo 644eada8a1 fix: 解决openssh低版本时测试可连接失败问题 2024-01-15 10:39:34 +08:00
wangruidong 000a3038e1 fix: 终端输入错误的MFA无日志记录 2024-01-14 18:32:33 -08:00
ibuler 9c8635b230 perf: 优化授权资产 api，很多资产也不怕 2024-01-14 18:30:57 -08:00
wangruidong e428eb351b feat: 同步ldap用户消息通知 2024-01-12 11:17:23 +05:00
fit2bot 1275087f19
perf: 添加LC_ALL环境变量C.UTF-8 解决ansible无法初始化首选语言环境问题 (#12530) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-12 11:21:27 +08:00
feng 311c01242b fix: 分页后排序失效 2024-01-12 10:18:05 +08:00
ibuler bab5b67c52 fix: 修复自定义 applet 导入的 bug 2024-01-11 15:41:10 +05:00
ibuler 00d6effd69 pref: stash 2024-01-11 18:33:52 +08:00
fit2bot 3eb0b768a6
fix: 改密账号更新日期没有更新 (#12524) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-11 16:57:23 +07:00
ibuler c06c68d5da perf: 统一翻译 2024-01-11 14:40:44 +08:00
fit2bot 6dcc74a388
fix: 账号备份只导出一条记录 (#12517) 
Co-authored-by: wangruidong <940853815@qq.com>
 2024-01-10 18:52:45 +08:00
ibuler 2b15fc5e8b perf: 兼用处理一下 tree 2024-01-10 11:23:16 +05:00
wangruidong df655f304a fix: 登录日志不显示 2024-01-10 11:21:29 +05:00
Bai 25223719cb perf: 支持配置 RADIUS_ATTRIBUTES 属性 2024-01-09 18:36:16 +08:00
jiangweidong 814dbeb749 fix: 解决手机号加密导致忘记密码判断总是失败问题 2024-01-08 16:24:28 +05:00
jiangweidong 630bb56601 fix: 解决手机号加密导致忘记密码判断总是失败问题 2024-01-08 16:24:28 +05:00
ibuler 496b72aaee perf: 优化导入错误 2024-01-08 17:44:49 +08:00
jiangweidong b4c1dd2944 perf: slack消息解析优化-mistune升级 2024-01-08 12:35:26 +05:00
jiangweidong 9ede3670a7 perf: 邮箱支持exchange协议 2024-01-08 12:35:01 +05:00
Eric 2a29cd0e70 perf: 使用 nginx 处理静态资源 2024-01-03 17:20:14 +08:00
ibuler 15ac81a422 perf: 优化标签绑定，仅绑定到资产上 2024-01-03 17:08:15 +08:00
fit2bot eb5a53b91b
perf: 翻译 (#12487) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-03 11:25:45 +08:00
feng 4dd72b109f feat: 历史账号定期删除 可设置保留数量 2024-01-03 07:52:24 +05:00
fit2bot 2fcbfe9f21
perf: 优化 tree nodes 避免太慢 (#12472) 
* perf: 优化 tree nodes 避免太慢

perf: 优化大量资产上的资产数生成比较慢

perf: 优化节点树

perf: 修改 tree nooooooooodes

perf: 优化一些 api 比较大的问题

perf: 优化平台 api

perf: 分页返回同步树

perf: 优化节点树

perf: 深度优化节点树

* perf: remove unused config

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-01-02 16:11:56 +08:00
wangruidong e80a0e41ba fix: 同步LDAP用户时，用户组只移除LDAP同步过来的 2024-01-02 12:04:25 +05:00
feng 2d6e815b3d fix: 如 Redis密码信息包含特殊字符时，服务启动失败 2024-01-02 08:11:12 +05:00
faming.zhou 257ee205ac fix: UNION 的类型 character varying 和 uuid 不匹配 2023-12-29 12:14:31 +05:00
feng 4b961a626b perf: 用户组列表中的用户添加 is_service_account 属性 2023-12-29 11:11:19 +05:00
wangruidong 653a6752b6 fix: 用户组删除用户权限问题 2023-12-29 13:36:39 +08:00
wangruidong 32255c6077 fix: 更新用户组权限问题 2023-12-29 07:42:10 +05:00
feng626 7a708156ee Revert "fix: 特定key paramiko 测试可连接性失败" 
This reverts commit a4d0e3fd17.
 2023-12-28 14:34:42 +05:00
Bai b72a446bbd fix: 修复label关联用户时不显示服务账号 2023-12-28 14:21:38 +05:00
feng 219fad9b62 fix: 账号备份密码如 t08\x08fIE 备份失败 2023-12-28 13:53:57 +05:00
Bai 6c1c8b241e perf: 优化资产管理中的标签权限位不显示 2023-12-28 15:27:20 +08:00
feng a4d0e3fd17 fix: 特定key paramiko 测试可连接性失败 2023-12-27 13:13:03 +05:00
fit2bot af44ffab0a
fix: 资产账号不存在时 同步删除资产账号任务报错 (#12437) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-27 14:39:11 +08:00
fit2bot a09b7b29e2
fix: 【账号收集】账号收集任务，关闭同步到资产时，只收集了一个资产的账号，其他资产的账号未收集 (#12428) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-26 16:05:28 +08:00
wangruidong 8f67922c80 perf: 资产登录提醒和用户登录提醒能显示用户名称 2023-12-26 12:54:28 +05:00
feng f1db5d6f44 perf: 重写GenericForeignKey 2023-12-26 12:51:09 +05:00
fit2bot 33ea5eb41f
perf: 资产可以通过address 排序 (#12427) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-26 14:23:04 +08:00
fit2bot 48bcbc6c53
perf: 翻译 (#12426) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-26 14:16:11 +08:00
Bai 3e090eb701 fix: 修复 连接远程应用时标签匹配失败的问题 2023-12-25 16:20:38 +05:00
Bai 6ac956c626 fix: 修复 api/docs 报错问题 2023-12-25 19:04:44 +08:00
wangruidong edb2d1bd7b fix: 我的资产列表标签信息没有显示 2023-12-25 16:02:16 +05:00
feng 81b4909016 fix: 【用户登录会话失效问题】SESSION_COOKIE_AGE 配置不生效的问题 2023-12-25 13:10:58 +05:00
wangruidong f6f1be423c perf: 统计任务执行结果 2023-12-22 14:18:25 +05:00
feng 6565f8c0a8 perf: 在 ansible 中切换用户时 添加超时操作 2023-12-22 12:23:19 +05:00
ibuler bc5494bbb0 perf: 优化 label choice 2023-12-21 16:51:36 +08:00
fit2bot febf08629a
fix: 翻译 (#12400) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-21 16:15:20 +08:00
fit2bot b6774aa749
perf: 更新全局组织名字 添加唯一性校验 (#12399) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-21 16:07:11 +08:00
fit2bot bc668f3e9f
fix: applet 压缩包名字(1).zip时 上传失败} (#12397) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-21 15:42:09 +08:00
fit2bot dc56b019b1
perf: 权限树翻译 (#12396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-21 15:00:46 +08:00
ibuler a38624d198 perf: 修改同名账号登录报错 2023-12-21 14:04:09 +08:00
ibuler ca026040fe perf: 优化导入账号报错 2023-12-21 12:40:59 +08:00
ibuler 88b9a4d693 perf: 修改搜索 2023-12-20 17:50:40 +05:00
ibuler 4d15e46ceb perf: 修改搜索 2023-12-20 17:50:40 +05:00
fit2bot 55575e9f7f
perf: 用户账号导出去除is_service_account (#12388) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-20 19:24:09 +08:00
wangruidong 98c9cddcbf fix: es命令记录可以看到其他资产执行的命令 2023-12-20 16:00:35 +05:00
fit2bot 533f13c634
perf: 优化创建账号密码校验逻辑 (#12383) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-20 16:35:36 +08:00
fit2bot c66b1db784
fix: 自动化任务网关连接数 自定义ansible rdp 测试可连接性端口错误 (#12373) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-20 16:02:13 +08:00
Eric d03ba7c391 perf: 页面配置是否启用 Vitual App 2023-12-20 13:01:50 +05:00
fit2bot 6544f8ade8
perf: 修改 labels 搜索 (#12379) 
* perf: 修改标签的搜索

* perf: 修改 labels 搜索

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-12-20 14:31:03 +08:00
ibuler ac5991fc43 perf: 修改标签的搜索 2023-12-20 10:57:58 +05:00
wangruidong 9b2b71dddc fix: 工单列表类型没有翻译 2023-12-20 10:57:29 +05:00
fit2bot e18e019460
fix: 账号列表，添加账号模版 500 (#12375) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-20 11:05:42 +08:00
fit2bot ef1875d9b5
perf: 优化工单显示 (#12368) 
Co-authored-by: wangruidong <940853815@qq.com>
 2023-12-19 19:06:39 +08:00
ibuler 0b7552a6ee perf: 修改 labels 绑定引起的问题 2023-12-19 16:06:05 +05:00
fit2bot 45425b11d2
perf: 优化 labels 支持多个搜索 (#12367) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-12-19 18:46:02 +08:00
jiangweidong fda3e6ec9b perf: model_to_dict无法转换不可编辑字段，导致消息中有的值为None 2023-12-19 14:30:13 +05:00
huailei 2b41486f2a
Merge pull request #12369 from jumpserver/pr@dev@chat_ai_test 
fix: chatAI代理配置错误，服务器报错500
 2023-12-19 15:42:06 +08:00
feng 59d9a3d4ec fix: chatAI代理配置错误，服务器报错500 2023-12-19 15:39:22 +08:00
wangruidong 3c7ba029dd perf: 工单显示优化 2023-12-19 12:10:34 +05:00
feng 8eab87f40d fix: 命令组模糊搜索，500 2023-12-19 15:05:35 +08:00
huailei c441e5bb92
Merge pull request #12365 from jumpserver/pr@dev@ansible 
fix: 修复ansible 任务 {{123}} 这样的密码失败问题
 2023-12-19 14:59:23 +08:00
feng da8d78f384 fix: 修复ansible 任务 {{123}} 这样的密码失败问题 2023-12-19 14:57:51 +08:00
jiangweidong 83b91cb739 perf: 优化命令禁止发送消息时，slack消息会包含html标签内容 2023-12-19 11:40:18 +05:00
fit2bot 1afad40dd3
perf: 优化 labels 绑定资源 (#12361) 
* perf: 优化 labels 绑定资源

* perf: 优化 labels list 显示

* perf: add migrations

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-12-19 10:20:11 +08:00
ibuler 1358cf532f perf: 修改 labels 和 role 搜索 2023-12-18 18:23:06 +05:00
feng d6b5590505 perf: 翻译 2023-12-18 18:36:44 +08:00
feng 4f2b3fbb43 perf: 迁移文件 2023-12-18 17:44:59 +08:00
fit2bot 1f2db65dba
fix: ansible 密码支持 {{ }} {% %} (#12354) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-18 17:31:35 +08:00
halo 006faac326 perf: 配置xpack后logo没有修改 2023-12-18 14:51:28 +08:00
ibuler f7fee0f430 perf: 修复标签搜索 2023-12-15 18:34:44 +08:00
fit2bot 714c44fbf4
perf: 授权创建时 通过模版创建账号 给账号添加来源 (#12345) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-15 18:28:48 +08:00
fit2bot 84b316e2c1
fix: 修复自动禁用用户默认排除 admin 用户 (#12346) 
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-12-15 18:28:24 +08:00
wangruidong 6955a3db11 perf: ldap测试登录提示优化&上产文件名长度限制 2023-12-15 18:06:47 +08:00
huailei d92736e624
Merge pull request #12343 from jumpserver/pr@dev@perf_password_rules 
perf: 优化校验密码规则 特殊字符校验
 2023-12-15 17:16:04 +08:00
feng 9d0da64ea1 perf: 优化校验密码规则 特殊字符校验 2023-12-15 17:14:34 +08:00
wangruidong b9e1d6093e perf: 翻译 2023-12-15 15:21:52 +08:00
Bai c3820b30b8 fix: 修复远程应用连接 labels 过滤问题 2023-12-15 13:26:01 +08:00
feng 32178b2344 perf: 修改默认prompt顺序 2023-12-15 10:48:04 +08:00
fit2bot e3c0518cfb
perf: 上传目标目录指定在/tmp下 (#12334) 
Co-authored-by: wangruidong <940853815@qq.com>
 2023-12-14 19:44:53 +08:00
jiangweidong 438e9dee2a fix: 解决第三方登录一个不存在的本地用户时，改密日志会增加的问题 2023-12-14 19:36:06 +08:00
Bai 3c9239eb09 fix: 修复 Release 应用账号的逻辑,解决首次连接远程应用可能出现没有可用账号的问题 2023-12-14 19:35:05 +08:00
Eric 81fb080c67 perf: 调整搜索字段 2023-12-14 18:28:55 +08:00
feng 6cf05435bf feat: chat prompt 2023-12-14 17:39:15 +08:00
wangruidong 65718c5a84 perf: 接口返回上传文件大小限制 2023-12-14 11:26:44 +08:00