Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed 694 #1

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
376 commits
Select commit Hold shift + click to select a range
a1087a2
Merge pull request #88 from jsonwan/github_feature/auth_use_account
wangyu096 Jul 13, 2021
6fa6ba1
perf: 运营分析页面优化 #89
hLinx Jul 13, 2021
f0df6b6
perf: 代码逻辑优化 #87
Jul 13, 2021
28f6068
feature: 新建作业模板完成后的跳转逻辑优化 #84
Jul 13, 2021
a83bc83
perf: 运营分析页面优化 #89
hLinx Jul 13, 2021
b5b9c75
perf: 运营分析页面优化 #89
hLinx Jul 13, 2021
3e7ad66
feature: 执行账号使用权限迁移 #30
jsonwan Jul 13, 2021
9175195
feature: 执行账号使用权限迁移 #30
jsonwan Jul 13, 2021
0138b1d
feature: 运营分析页面优化 #89
hLinx Jul 14, 2021
8235619
feature: 执行账号使用权限迁移 #30
jsonwan Jul 14, 2021
4c06da3
feature: 执行账号使用权限迁移 #30
jsonwan Jul 14, 2021
842126b
Merge pull request #91 from jsonwan/github_feature/auth_use_account
wangyu096 Jul 14, 2021
05f5d3b
bugfix: esb api 返回响应,如果属性值为空,默认返回null #94
Jul 14, 2021
2f6b278
Merge pull request #95 from wangyu096/github_bugfix/return_default_wh…
jsonwan Jul 14, 2021
556f8d0
feature: 从“执行方案”列表页进入执行或同步页后,返回路径应该保留 #85
hLinx Jul 14, 2021
9a91093
bugfix: esb api 返回响应,如果属性值为空,默认返回null #94
Jul 15, 2021
ebd49c5
Merge pull request #96 from wangyu096/github_bugfix/return_default_wh…
jsonwan Jul 15, 2021
7a89fa4
fix: 模板全局变量批量编辑 #98
hLinx Jul 15, 2021
ead0c06
Merge pull request #99 from hLinx/hotfix_3.3.5
hLinx Jul 15, 2021
f2815bc
fix: 全局设置页面无权限报错 #97
jsonwan Jul 15, 2021
5048b60
perf: esb api normalization #79
Jul 15, 2021
7c8a097
Merge branch 'master' of github.com:Tencent/bk-job into github_perf/e…
Jul 15, 2021
cf0b350
Merge pull request #100 from wangyu096/github_perf/esb_api_normalization
jsonwan Jul 15, 2021
5bac697
Merge pull request #101 from jsonwan/github_fix/global_settings
wangyu096 Jul 15, 2021
4657693
Merge remote-tracking branch 'github_job/master' into hotfix_3.3.5
hLinx Jul 16, 2021
7784964
Merge pull request #103 from Tencent/master
jsonwan Jul 16, 2021
a090904
fix: 模板全局变量批量编辑 #98
hLinx Jul 16, 2021
1d8d1e2
fix: 动态分组无权限报错 #102
jsonwan Jul 16, 2021
a64c0b4
Merge pull request #105 from jsonwan/fix/dynamic_group_permission
wangyu096 Jul 16, 2021
4cc531f
Merge pull request #104 from hLinx/hotfix_3.3.5
hLinx Jul 16, 2021
c1fbe4e
perf: change response trace id header #106
Jul 16, 2021
dd9ff29
Merge pull request #107 from wangyu096/github_perf/change_job_trace_i…
jsonwan Jul 16, 2021
40fffa3
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 18, 2021
53550d3
Merge remote-tracking branch 'github_job/master' into feature_3.3.6
hLinx Jul 19, 2021
645ed1a
perf: 多行文本复制优化 #108
hLinx Jul 19, 2021
a2eae2d
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 19, 2021
a91a3e0
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 19, 2021
a138feb
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 19, 2021
8daf5a9
perf: 多行文本复制优化 #108
hLinx Jul 19, 2021
25f378a
perf: 作业执行历史检索优化 #109
Jul 19, 2021
4049224
perf: 作业执行历史检索优化 #109
Jul 19, 2021
ec5354e
Merge pull request #110 from wangyu096/github_perf/optimize_task_inst…
jsonwan Jul 19, 2021
ab4ef8b
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 19, 2021
7c78847
bugfix: 重做作业实例,脚本参数变量渲染对于空值的处理不正确 #111
Jul 19, 2021
b13fdb5
Merge pull request #112 from wangyu096/github_bugfix/resolve_script_p…
jsonwan Jul 19, 2021
c693d65
Merge branch 'github_master' into github_feature/file_source_api
jsonwan Jul 19, 2021
15ac818
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 20, 2021
91a7da9
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 20, 2021
ac1c5aa
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
jsonwan Jul 21, 2021
509c079
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
jsonwan Jul 21, 2021
a2e4112
bugfix: mongodb日志collection,分片数据存储不均衡 #114
Jul 21, 2021
69afed4
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 21, 2021
9639e80
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 22, 2021
c25acff
perf: 添加非主机类型的全局变量,没有隐藏移除无效主机的按钮 #117
hLinx Jul 22, 2021
fd97049
perf: 全局变量功能描述不准确 #118
hLinx Jul 22, 2021
ed3b138
Merge pull request #119 from hLinx/hotfix_3.3.5
hLinx Jul 22, 2021
f99070c
Merge remote-tracking branch 'github_job/master' into feature_3.3.6
hLinx Jul 22, 2021
8b99144
docs: 更新文档 #1
jsonwan Jul 27, 2021
3ea4a5a
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
hLinx Jul 27, 2021
ed4d884
fix: 无效节点判断方式更新 #123
hLinx Jul 27, 2021
cfdbfcd
Merge pull request #122 from jsonwan/github_docs/add_en_docs
wangyu096 Jul 27, 2021
aac1ae3
Merge pull request #125 from hLinx/hotfix_3.3.5
hLinx Jul 28, 2021
ec8e9b3
Merge pull request #124 from hLinx/hotfix_3.3.5
hLinx Jul 28, 2021
fed2c31
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
hLinx Jul 28, 2021
5870850
feature: 提供文件源管理、凭据管理相关ESB API #92
jsonwan Jul 28, 2021
b271b3f
Merge pull request #126 from jsonwan/github_feature/file_source_api
wangyu096 Jul 28, 2021
13ede7c
Merge branch 'github_master' into github_feature/whiteip_scope_query
jsonwan Jul 28, 2021
f1b2932
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
jsonwan Jul 28, 2021
5529873
feature: 白名单IP添加时增加对“执行方式”的判断,如仅开文件分发则在脚本执行中不可选中 #115
jsonwan Jul 28, 2021
b6f6e1b
Merge pull request #128 from jsonwan/github_feature/whiteip_scope_query
wangyu096 Jul 28, 2021
781c40b
Merge pull request #90 from hLinx/feature_3.3.6
hLinx Jul 28, 2021
29cbe8e
Merge branch 'master' of github.com:Tencent/bk-job into github_bugfix…
Jul 29, 2021
c2ac8ad
Merge pull request #130 from wangyu096/github_bugfix/mongodb_collecti…
jsonwan Jul 29, 2021
83ebc59
feature: 模板步骤编辑面板添加变量指引 #131
hLinx Jul 29, 2021
f1a1d5f
Merge remote-tracking branch 'github_job/3.3.x' into hotfix_3.3.5
hLinx Jul 29, 2021
fae24d8
perf: 全局变量功能描述不准确 #118
hLinx Jul 29, 2021
574a809
Merge pull request #132 from hLinx/hotfix_3.3.5
hLinx Jul 29, 2021
15835aa
Merge pull request #133 from hLinx/feature_3.3.6
hLinx Jul 29, 2021
ce64386
Merge pull request #134 from hLinx/hotfix_3.3.5
hLinx Jul 29, 2021
26f42c0
Merge tag 'v3.3.5.4' into github_3.3.x
jsonwan Jul 29, 2021
7ba0a62
Merge pull request #135 from jsonwan/github_3.3.x
jsonwan Jul 29, 2021
f997583
Merge remote-tracking branch 'github_job/3.3.x' into feature_3.3.6
hLinx Jul 29, 2021
03c6cc6
bugfix: 任务下发不判断agent状态 #137
Jul 29, 2021
1efda30
Merge pull request #138 from wangyu096/github_bugfix/agent_alive
jsonwan Jul 29, 2021
7534830
bugfix: 任务下发不判断agent状态 #137
Jul 29, 2021
d2c2401
Merge pull request #139 from wangyu096/github_bugfix/agent_alive
wangyu096 Jul 29, 2021
3e1b2f6
bugfix: 任务下发不判断agent状态 #137
Jul 29, 2021
f61dc6e
Merge pull request #140 from wangyu096/github_bugfix/agent_alive
wangyu096 Jul 29, 2021
a813277
bugfix: 任务下发不判断agent状态 #137
Jul 29, 2021
592944d
Merge pull request #141 from wangyu096/github_bugfix/agent_alive
jsonwan Jul 29, 2021
8b43a50
fix: 服务器文件服务器列表切换不生效 #142
hLinx Jul 30, 2021
1b6c76c
Merge pull request #143 from hLinx/hotfix_variable
hLinx Jul 30, 2021
242e663
Merge pull request #144 from hLinx/hotfix_variable
hLinx Jul 30, 2021
a261476
bugfix: 文件任务包含大量的源和目标主机,导致执行引擎阻塞 #145
Jul 30, 2021
f406b36
bugfix: 文件任务包含大量的源和目标主机,导致执行引擎阻塞 #145
Jul 30, 2021
d920cb9
bugfix: 文件任务包含大量的源和目标主机,导致执行引擎阻塞 #145
Jul 31, 2021
120bbd0
chore: 部署流程优化 #18
jsonwan Aug 2, 2021
3ed233c
chore: 部署流程优化 #18
jsonwan Aug 2, 2021
dd0b401
chore: 部署流程优化 #18
jsonwan Aug 2, 2021
7b5a41f
Merge branch 'master' of github.com:Tencent/bk-job into github_bugfix…
Aug 3, 2021
3869118
bugfix: 文件任务包含大量的源和目标主机,导致执行引擎阻塞 #145
Aug 3, 2021
62cc8b9
Merge pull request #148 from wangyu096/github_bugfix/limit_file_task_…
jsonwan Aug 3, 2021
fb6f22b
Merge pull request #146 from jsonwan/github_chore/deploy_optimize
wangyu096 Aug 3, 2021
683ce7a
Merge remote-tracking branch 'github_job/master' into feature_3.3.6
hLinx Aug 3, 2021
f4d99e8
perf: 对文件分发任务的源和目标使用同一批目标的情况做提醒交互 #147
hLinx Aug 3, 2021
f868c8a
fix: 目标服务器在搜索状态下重新选择主机IP页面显示错误 #149
hLinx Aug 3, 2021
ef42cf0
perf: 代码逻辑优化 #87
hLinx Aug 3, 2021
0123cd3
Merge pull request #136 from hLinx/feature_3.3.6
hLinx Aug 3, 2021
b61055d
docs: 更新3.3.6.0版本日志 #150
jsonwan Aug 3, 2021
a8b08b5
Merge pull request #151 from jsonwan/github_docs/versionlog
jsonwan Aug 3, 2021
bb2fc2a
perf: 被引用的 tooltips 优化 #153
hLinx Aug 5, 2021
f999b49
Merge pull request #156 from Tencent/master
jsonwan Aug 5, 2021
328690e
Update issue templates
nekzhang Aug 6, 2021
9eb638c
feature: 脚本版本UI更新 #152
hLinx Aug 6, 2021
a8f2c52
feature: 脚本版本UI更新 #152
hLinx Aug 11, 2021
7b933cc
perf: 任务状态的字段列宽度优化 #164
hLinx Aug 11, 2021
f26be52
perf: 定时任务的执行记录tab切换交互优化 #161
hLinx Aug 11, 2021
6420760
perf: 脚本”被引用“的指引和交互优化 #159
hLinx Aug 13, 2021
bc3b690
feature: 定时任务查看态增加对cron表达式注解指引的视觉效果 #160
hLinx Aug 13, 2021
4796642
Merge branch 'feature_script' into feature_3.3.7
hLinx Aug 13, 2021
aa92b18
perf: 脚本版本Tag 的颜色优化 #154
hLinx Aug 13, 2021
3f689e3
format: 代码格式调整 #166
hLinx Aug 13, 2021
ec9aea9
perf: 脚本版本Tag 的颜色优化 #154
hLinx Aug 13, 2021
7f2a362
perf:国际化补全 #168
hLinx Aug 16, 2021
7d41049
feature: 脚本版本UI更新 #152
hLinx Aug 17, 2021
7ed83a0
feature: 脚本版本UI更新 #152
hLinx Aug 17, 2021
fd4942a
perf:国际化补全 #168
hLinx Aug 17, 2021
4737a69
perf:国际化补全 #168
hLinx Aug 18, 2021
2fa73f8
perf:国际化补全 #168
hLinx Aug 19, 2021
dc39b47
format: 代码格式调整 #166
hLinx Aug 19, 2021
7ed0d4d
bugfix: 人工确认步骤的确认人配置的是任务执行人,但是非任务执行人却可以操作 #172
Aug 20, 2021
8f38545
perf:国际化补全 #168
hLinx Aug 20, 2021
22e7299
Merge pull request #174 from wangyu096/github_bugfix/confirm_by_job_t…
jsonwan Aug 20, 2021
552abff
format: 代码格式调整 #166
hLinx Aug 20, 2021
b03a81b
fix: 导出大量作业下载文件未完成就中断 #173
jsonwan Aug 23, 2021
60a64d5
fix: 导出大量作业下载文件未完成就中断 #173
jsonwan Aug 23, 2021
e581856
docs: 更新3.3.7.0版本日志 #176
jsonwan Aug 23, 2021
c75fbaf
Merge pull request #177 from Tencent/github_docs/versionlog
jsonwan Aug 23, 2021
e6c2e2b
format: 代码格式调整 #166
hLinx Aug 23, 2021
8f2ec25
Merge pull request #175 from Tencent/github_fix/export_download_fail
jsonwan Aug 23, 2021
532cf25
format: 代码格式调整 #166
hLinx Aug 23, 2021
e3be9c9
Merge pull request #165 from hLinx/feature_3.3.7
hLinx Aug 23, 2021
c0624c6
format: 代码格式调整 #166
hLinx Aug 30, 2021
b3fa09d
Merge pull request #186 from hLinx/hotfix_3.3.7
hLinx Aug 30, 2021
6023c45
format: 代码格式调整 #166
hLinx Aug 31, 2021
a1ca778
Merge pull request #189 from hLinx/hotfix_3.3.7
hLinx Aug 31, 2021
2eb1e4a
feature: 业务集操作API扩展,支持查询业务集业务以及对业务集的删除操作 #190
wangyu096 Sep 1, 2021
04ea402
feature: 业务集操作API扩展,支持查询业务集业务以及对业务集的删除操作 #190
wangyu096 Sep 1, 2021
2d5b687
Merge pull request #191 from wangyu096/github_feature/app_set_api
jsonwan Sep 1, 2021
5b9a8ba
bug: 下发给gse的脚本任务路径不一致 #187
wangyu096 Sep 1, 2021
22b7357
bug: 下发给gse的脚本任务路径不一致 #187
wangyu096 Sep 1, 2021
029bf56
fix: 克隆作业模板时全局变量的引用失效 #192
hLinx Sep 3, 2021
24856ff
Merge pull request #193 from hLinx/hotfix_3.3.7_copy
hLinx Sep 3, 2021
7bfdfef
fix: 业务相关的全部接口增加前置“业务访问”鉴权 #169
jsonwan Aug 16, 2021
634744b
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Aug 31, 2021
cb5ec7a
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Aug 31, 2021
e923781
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 3, 2021
dfc69ad
perf: 权限中心获取作业模板/执行方案、脚本、账号等资源的搜索接口 #180
jsonwan Sep 2, 2021
b858725
perf: 权限中心获取作业模板/执行方案、脚本、账号等资源的搜索接口 #180
jsonwan Sep 3, 2021
730288a
perf: 提供JOB的资源拓扑_bk_iam_path_ 提升权限中心推荐精准度 #181
jsonwan Sep 6, 2021
e34bac0
perf: 提供JOB的资源拓扑_bk_iam_path_ 提升权限中心推荐精准度 #181
jsonwan Sep 6, 2021
5cc210b
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 7, 2021
226809e
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 7, 2021
839db0d
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
d96b165
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
057be0c
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
c2d9241
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
7b7cc54
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
09096b3
fix: 补充业务维度相关接口的“业务访问“前置鉴权 #179
jsonwan Sep 8, 2021
177b82b
docs: 更新3.3.7.0版本日志 #176
jsonwan Sep 8, 2021
550b1ce
Merge pull request #198 from jsonwan/github_docs/versionlog
jsonwan Sep 8, 2021
c42cacf
fix: 获取定时任务周期成功率因索引不正确导致无法正常显示的问题 #199
jsonwan Sep 9, 2021
3e826aa
Merge pull request #200 from jsonwan/github_fix/cron_success_rate
jsonwan Sep 9, 2021
2662f6a
Merge branch 'github_fix/auth_biz' into github_perf/iam_search
jsonwan Sep 9, 2021
a3438f3
Merge branch 'github_perf/iam_search' into github_perf/fetch_iam_path
jsonwan Sep 9, 2021
05d5404
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 9, 2021
4b585f2
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 9, 2021
dd9d85d
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 9, 2021
09a23af
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 9, 2021
1fd3a0e
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 10, 2021
dd2bb9a
bug: 脚本日志导出不全 #207
wangyu096 Sep 10, 2021
4422db4
perf: 微服务调用认证失败的日志优化 #210
wangyu096 Sep 10, 2021
38fa674
Merge pull request #212 from wangyu096/github_perf/service_jwt_auth_l…
jsonwan Sep 10, 2021
e4a3b37
bug: 下发给gse的脚本任务路径不一致 #187
wangyu096 Sep 10, 2021
130e6b8
Merge branch 'master' of github.com:Tencent/bk-job into github_bugfix…
wangyu096 Sep 10, 2021
1466f8a
Merge pull request #195 from jsonwan/github_fix/auth_biz
wangyu096 Sep 10, 2021
4e8ee18
Merge branch 'github_master' into github_perf/auth_dangerous_rule
jsonwan Sep 10, 2021
c76e870
Merge pull request #208 from jsonwan/github_perf/auth_dangerous_rule
wangyu096 Sep 10, 2021
a8dc6cf
Merge branch 'master' of github.com:Tencent/bk-job into github_bugfix…
wangyu096 Sep 10, 2021
5102ed9
Merge branch 'github_master' into github_perf/iam_search
jsonwan Sep 10, 2021
6ff10f9
Merge pull request #213 from wangyu096/github_bugfix/export_script_ta…
jsonwan Sep 10, 2021
c226628
Merge branch 'master' of github.com:Tencent/bk-job into github_bugfix…
wangyu096 Sep 10, 2021
88eef60
Merge branch 'github_master' into github_perf/iam_search
jsonwan Sep 10, 2021
5f3a2f2
Merge branch 'github_perf/iam_search' into github_perf/fetch_iam_path
jsonwan Sep 10, 2021
3f3bf09
perf: 提供JOB的资源拓扑_bk_iam_path_ 提升权限中心推荐精准度 #181
jsonwan Sep 10, 2021
39881d6
Merge pull request #215 from jsonwan/github_perf/fetch_iam_path
wangyu096 Sep 10, 2021
70b778f
Merge pull request #214 from wangyu096/github_bugfix/standardized_tas…
jsonwan Sep 10, 2021
6787990
perf: 提供JOB的资源拓扑_bk_iam_path_ 提升权限中心推荐精准度 #181
jsonwan Sep 10, 2021
a7c115c
Merge pull request #216 from jsonwan/github_perf/fetch_iam_path
jsonwan Sep 10, 2021
177db1f
bug: 用户没有公共脚本管理权限,却可以通过API查看到未上线的公共脚本版本信息 #196
wangyu096 Sep 11, 2021
2df8da4
Merge pull request #219 from wangyu096/github_bugfix/auth_public_scri…
jsonwan Sep 13, 2021
73abd6e
feature: 单次定时任务提供api接口创建 #194
jsonwan Sep 13, 2021
1bdb1a4
feature: 新增batch_get_job_instance_ip_log API #9
wangyu096 Sep 13, 2021
8a0354f
Merge branch 'master' of github.com:Tencent/bk-job into github_featur…
wangyu096 Sep 13, 2021
4bac86d
feature: 单次定时任务提供api接口创建 #194
jsonwan Sep 13, 2021
bb4b805
Merge pull request #225 from jsonwan/github_feature/create_single_cron
jsonwan Sep 13, 2021
abbe609
docs: 增加3.3.8版本日志 #228
jsonwan Sep 13, 2021
4fa1f19
Merge pull request #229 from jsonwan/github_docs/versionlog
jsonwan Sep 13, 2021
1f9a335
feature: 新增batch_get_job_instance_ip_log API #9
wangyu096 Sep 14, 2021
5a65208
Merge branch 'master' of github.com:Tencent/bk-job into github_featur…
wangyu096 Sep 14, 2021
16721e8
Merge pull request #231 from wangyu096/github_feature/batch_get_job_i…
jsonwan Sep 14, 2021
5baa84b
perf: 高危语句规则配置及拦截记录查看鉴权 #202
jsonwan Sep 14, 2021
d22e3ae
Merge pull request #232 from jsonwan/github_perf/auth_dangerous_rule
jsonwan Sep 14, 2021
a98062d
Merge pull request #241 from Tencent/master
jsonwan Sep 16, 2021
278c357
chore: 部署流程优化 #18
jsonwan Sep 18, 2021
882aceb
chore: 部署流程优化 #18
jsonwan Sep 18, 2021
cddafe4
docs: 增加3.3.8版本日志 #228
jsonwan Sep 23, 2021
f06a62a
Merge branch '3.3.x' of github.com:Tencent/bk-job into github_job/3.3.x
jsonwan Sep 23, 2021
3dddd4c
fix: 本地文件上传报错 #273
hLinx Sep 28, 2021
a94db50
Merge pull request #275 from hLinx/hotfix_fileupload
hLinx Sep 28, 2021
735cee4
fix: 脚本检测 #277
hLinx Sep 29, 2021
d07fdd2
Merge pull request #279 from hLinx/hotfix_script
hLinx Sep 29, 2021
49bfb8f
feature: 微服务安全配置优化 #287
wangyu096 Oct 1, 2021
35e9a2b
Merge pull request #288 from wangyu096/github_feature/config_security
wangyu096 Oct 1, 2021
7e5b8cf
fix: clone作业模板删除逻辑处理 #327
hLinx Oct 19, 2021
8aed1d5
fix: clone作业模板删除逻辑处理 #327
hLinx Oct 19, 2021
8d59639
fix: clone作业模板删除逻辑处理 #327
hLinx Oct 19, 2021
c66348e
Merge pull request #328 from hLinx/hotfix_template_clone
hLinx Oct 19, 2021
c18604f
fix: clone作业模板删除逻辑处理 #327
hLinx Oct 19, 2021
3e49822
Merge pull request #333 from hLinx/hotfix_template_clone
hLinx Oct 19, 2021
5188072
perf: 升级迁移工具支持定时任务开关恢复_3.3.x #350
wangyu096 Oct 18, 2021
afb42b1
Merge pull request #359 from wangyu096/github_feature/internal_change…
jsonwan Oct 22, 2021
ae264d9
chore: 升级构建工具shadow版本 #539
jsonwan Dec 15, 2021
dd554f7
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Dec 23, 2021
250e579
Merge branch '3.3.x' of github.com:Tencent/bk-job into github_bugfix/…
wangyu096 Dec 23, 2021
ef4c672
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Dec 23, 2021
f6b2363
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Dec 23, 2021
3715293
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Dec 23, 2021
9b11c3d
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Dec 23, 2021
e94de8f
Merge pull request #573 from wangyu096/github_bugfix/spring_cloud_con…
wangyu096 Dec 28, 2021
7c83aee
perf: 3.3.x日志优化,便于排查同步异常问题 #593
jsonwan Jan 2, 2022
dd7ad1a
Merge pull request #594 from jsonwan/github_perf/3.3.x_log
jsonwan Jan 5, 2022
698de95
bugfix: Spring Cloud Config 漏洞 CVE-2020-5410 #558
wangyu096 Jan 11, 2022
5da8af7
Merge branch '3.3.x' of github.com:Tencent/bk-job into github_bugfix/…
wangyu096 Jan 11, 2022
349295a
Merge pull request #615 from wangyu096/github_bugfix/spring_cloud_con…
jsonwan Jan 12, 2022
d1ef731
bugfix: Logback CVE-2021-42550 漏洞修复 for job_3.3.x #639
wangyu096 Jan 19, 2022
c4ca3e3
Merge pull request #640 from wangyu096/github_bugfix/logback-CVE-2021…
wangyu096 Jan 19, 2022
eb7ea2f
bug: Spring Cloud Gateway 高危漏洞 CVE-2022-22947 #679
wangyu096 Mar 7, 2022
0d50e9a
Merge pull request #688 from wangyu096/github_bugfix/3.3.x_CVE-2022-2…
wangyu096 Mar 7, 2022
eb5852a
bug: Spring Cloud Gateway 版本过低,存在高危漏洞CVE-2022-22947 #694
smarttillzyj Mar 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Bug Report
about: Report a bug encountered while operating bk-job
title: ''
labels: kind/bug
assignees: ''

---


10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Enhancement Request
about: Suggest an enhancement to the bk-job project
title: ''
labels: kind/enhancement
assignees: ''

---


47 changes: 47 additions & 0 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This is a basic workflow to help you get started with Actions

name: Backend CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
paths:
- 'src/backend/**'
pull_request:
branches: [ master, 3.* ]
paths:
- 'src/backend/**'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- name: init mysql
run: |
sudo /etc/init.d/mysql start
export MYSQL_PWD=root
for i in */*.sql;do echo $i;mysql -h localhost -uroot < $i;done
working-directory: support-files/sql
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Cache Gradle
uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Gradle Build
working-directory: src/backend
run: ./gradlew clean build -DmysqlURL=127.0.0.1:3306 -DmysqlUser=root -DmysqlPasswd=root -DmavenRepoUrl="http://maven.aliyun.com/nexus/content/groups/public/"
27 changes: 27 additions & 0 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Frontend CI

on:
push:
branches: [ master ]
paths:
- 'src/frontend/**'
pull_request:
branches: [ master, 3.* ]
paths:
- 'src/frontend/**'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- run: echo "npm version=$(npm -v)"
- name: build
run: |
export JOB_VERSION=3.latest
npm i && npm run build
working-directory: src/frontend
80 changes: 80 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: Tag Realse
on:
push:
tags:
- 'v*'

jobs:
build:
name: Build whole project and release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up variables
id: variables
run: |
tag="$(basename $GITHUB_REF)"
version=${tag##v}
echo "::set-output name=tag::${tag}"
echo "::set-output name=version::${version}"
- name: init mysql
run: |
sudo /etc/init.d/mysql start
export MYSQL_PWD=root
for i in */*.sql;do echo $i;mysql -h localhost -uroot < $i;done
working-directory: support-files/sql
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Cache Gradle
uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Gradle Build Backend
working-directory: src/backend
run: ./gradlew clean build -Dversion=${{ steps.variables.outputs.version }} -DmysqlURL=127.0.0.1:3306 -DmysqlUser=root -DmysqlPasswd=root -DmavenRepoUrl="http://maven.aliyun.com/nexus/content/groups/public/"

- name: Npm Build Frontend
run: |
echo "npm version=$(npm -v)"
export JOB_VERSION=${{ steps.variables.outputs.version }}
npm i && npm run build
mkdir -p release/job/frontend
cp -r dist/* release/job/frontend
working-directory: src/frontend

- name: Build VersionLogs
run: python genBundledVersionLog.py
working-directory: versionLogs

- name: Create artifact - make package
id: create_artifact
run: |
echo ${{ steps.variables.outputs.version }} > ./VERSION
chmod 755 ./package.sh
./package.sh -m all -v ${{ steps.variables.outputs.version }}

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: bk-job ${{ github.ref }}
draft: true
prerelease: true

- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./release/job_ce-${{ steps.variables.outputs.version }}.tgz
asset_name: job_ce-${{ steps.variables.outputs.version }}.tgz
asset_content_type: application/gzip
82 changes: 82 additions & 0 deletions README.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
![LOGO](docs/resource/img/bk-job.png)
---
[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-job/blob/master/LICENSE.txt) [![Release Version](https://img.shields.io/github/v/release/Tencent/bk-job?include_prereleases)](https://github.com/Tencent/bk-job/releases)

English | [简体中文](README.md)

> **Notice**: During the process of development, the 'master' branch might be in an *unstable state or unavailable state*.
Please access the stable binary file via [releases](https://github.com/tencent/bk-job/releases) instead of 'master'.

The BK-JOB is a ops script management and execution system with the capability of dealing with multiple tasks simultaneously. In addition to script execution, file distribution, cron jobs, and other basic operation environments, it is also capable of putting together all the individual tasks into an automated workflow. All tasks, as individual nodes, can be offered to upper-level or peripheral systems/platforms, making it an automated cross-system dispatching system.

## Benefits

### Dependable Dangerous Command Detection Ability

As an underlying atomic operation platform made for server OS, the verification of user command's validity and safety is of critical importance! The platform allows for regular expression detection rules for dangerous commands in various script languages, and provides a log for intercepted operations. Even when a command is made by a peripheral system via API, it'll be intercepted immediately, making the server more secure!

### Comprehensive Script Version Management

Cloud management of script versions, which is accordant with the modern concept of collaboration. Aided by the convenient platform and version management feature, BK-JOB users can share script resources, control the releasing status of various versions, and reduce loss if there's a security vulnerability.

### Arrange Jobs for All Scenarios

When an operation scenario requires multiple interconnected steps, clicking them one by one is too inefficient! Besides, it is inconvenient for later usage and maintenance.

The task management feature offers an optimal solution. Users can set up the necessary steps on the "Job Template" before making up an "Executable Plan" as required by the scenario; As such, job templates and its instances are set apart rather than welded together, which is also beneficial to later management and maintenance.

### The Authentic Cron Jobs

Linux's original crontab job feature is preserved, allowing the maintenance team to access them easily. The friendly monitoring feature allows you to easily control and assess the situation of scheduled tasks.

### Scalable File Source Management

When it comes to file distribution, we not only use remote server and local files as source of transmission, we also need to retrieve files from different file systems/services such as object storage, FTP, and Samba.

To meet the diversified demands, we have enabled the file source plug-in feature, which allows developers to develop plugins for the file management modules on the platform according to their own file system. As such, they can distribute files from various file systems.


BK-JOB provides quick execution, task arrangement, cron job, and a wide range of core services, meeting the demands of all environments:
- **Quick Execution**: Offers a temporary, versatile, quick access.
- **Task Arrangement**: Transforms repetitive operations into "jobs" using the arrangement feature to make them easy to use and manage.
- **Scheduled Execution**: Allows users to make up periodic or one-off execution plans according to the logical needs of their business.
- **Script Management**: Manage scripts in a cloud-based mode, which further facilitates job arrangement and the flexibility of peripheral system scheduling.
- **Account Management**: The execution account of that manages server OS, such as Linux root or Windows administrator, etc.
- **Notification**: Allows businesses to send notifications on the execution result for various task statuses.
- **File Source Management**: Enables file source plugins, allowing it to retrieve and transfer files from various file systems.
- **Operation Analysis**: Displays platform operation statistics, which allows the administrator to have an all-around insight into the operation of the platform.
- **Platform Management**: A versatile platform management tool whose features include, but not limited to, information modification, message channel settings, rules for detecting dangerous commands, feature limitation settings, public script management, background service status display, etc.

## Overview

- [Architecture Design](docs/overview/architecture.en.md)
- [Code Directory](docs/overview/code_framework.en.md)
- [Design Philosophy](docs/overview/design.en.md)

## Features

For more information, please check Blueking's official website [Platform Product Overview](https://bk.tencent.com/docs/document/6.0/125/5748)

## Getting started
- [Download and Compile](docs/overview/source_compile.en.md)
- [Installation Setup](docs/overview/installation.en.md)

## Support
1. [GitHub Community](https://github.com/Tencent/bk-job/discussions)

## BlueKing Community
- [BK-BCS](https://github.com/Tencent/bk-bcs): Blueking Container Service is a container-based basic service platform that provides management service to microservice businesses.
- [BK-BCS-SaaS](https://github.com/Tencent/bk-bcs-saas): Blueking Container Platform SaaS is based on two modes: original Kubernetes and self-developed Mesos, offering users highly scalable, flexible container service.
- [BK-CI](https://github.com/Tencent/bk-ci): Blueking Continuous Integration platform is a free, open source CI service, which allows developers to automatically create - test - release workflow, and continuously, efficiently deliver their high-quality products.
- [BK-CMDB](https://github.com/Tencent/bk-cmdb): BlueKing CMDB is an enterprise-level management platform designed for assets and applications.
- [BK-PaaS](https://github.com/Tencent/bk-PaaS): Blueking PaaS is an open development platform that allows developers to efficiently create, develop, set up, and manage SaaS apps.
- [BK-SOPS](https://github.com/Tencent/bk-sops): Blueking SOPS is a system that features workflow arrangement and execution using a graphical interface. It's a lightweight task scheduling and arrangement SaaS product of the Blueking system.

## Contributing
- For more information about bk-job's fork management, issue and PR rules, please check [Contributing](CONTRIBUTING.md).
- [Tencent Open Source Incentive Plan](https://opensource.tencent.com/contribution) encourages developers to engage and contribute in the community. Join us now!


## License
BK-JOB is based on the MIT agreement. For more information, please check [LICENSE](LICENSE.txt).

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
---
[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-job/blob/master/LICENSE.txt) [![Release Version](https://img.shields.io/github/v/release/Tencent/bk-job?include_prereleases)](https://github.com/Tencent/bk-job/releases)

[English](README.en.md) | 简体中文

> **重要提示**: `master` 分支在开发过程中可能处于 *不稳定或者不可用状态* 。
请通过[releases](https://github.com/tencent/bk-job/releases) 而非 `master` 去获取稳定的二进制文件。
Expand Down
28 changes: 28 additions & 0 deletions UPGRADE.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## About Updates

English | [简体中文](UPGRADE.md)

### Version 3.3.4.x
This version is joined by a new update tool (upgrader-3.3.4.x.jar, in the same directory with other binary packages). It needs to be run before and after restarting the process of Job binary Jar file update (all microservice processes), which is twice in total for the tool, in order to transfer permission data and encrypted account data.

**Compatibility**
It is used for updates from 3.x.x.x to 3.3.4.x or higher. It doesn't need to be executed when updating within the 3.3.4.x version (e.g. 3.3.4.0-->3.3.4.3)

**Using the Tool**
Launch the tool with the command: `java -Dfile.encoding=utf8 -Djob.log.dir=path/to/log/dir -Dconfig.file=/path/to/config/file -jar upgrader-[x.x.x.x].jar [fromVersion] [toVersion] [executeTime]` Next, enter the specific parameters of the version update task based on the command line prompts, then run the update tool.

/path/to/log/dir The log saving path for specified tools, mostly ${BK_HOME}/logs/job
/path/to/config/file The configuration file loaded by specific tools. The configuration file is automatically generated by the setup script. Its path is: ${BK_HOME}/etc/job/upgrader/upgrader.properties
fromVersion is the current platform version, e.g. 3.2.7.3
toVersion is target platform version, e.g. 3.3.4.0
executeTime is the execution time of the update task, its has BEFORE_UPDATE_JOB and AFTER_UPDATE_JOB values. If you're running this tool before the platform update, enter BEFORE_UPDATE_JOB. If its after the update, enter AFTER_UPDATE_JOB

Example:
Before Job process update:
```shell script
/opt/java/bin/java -Dfile.encoding=utf8 -Djob.log.dir=/data/bkee/logs/job -Dconfig.file=/data/bkee/etc/job/upgrader/upgrader.properties -jar upgrader-3.3.4.0.jar 3.2.7.3 3.3.4.0 BEFORE_UPDATE_JOB
```
After Job process update:
```shell script
/opt/java/bin/java -Dfile.encoding=utf8 -Djob.log.dir=/data/bkee/logs/job -Dconfig.file=/data/bkee/etc/job/upgrader/upgrader.properties -jar upgrader-3.3.4.0.jar 3.2.7.3 3.3.4.0 AFTER_UPDATE_JOB
```
28 changes: 28 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## 升级说明

[English](UPGRADE.en.md) | 简体中文

### 版本3.3.4.x
该版本增加一个升级工具(upgrader-3.3.4.x.jar,与其他二进制包在同一目录),需要在更新Job二进制Jar文件重启进程(所有微服务进程)前后用不同参数分别执行一次,工具总共执行两次,用于迁移权限数据和账号加密数据。

**适用范围**
适用于从3.x.x.x向3.3.4.x及以上版本升级,3.3.4.x版本内升级(如3.3.4.0-->3.3.4.3)无需执行。

**工具用法**
使用命令`java -Dfile.encoding=utf8 -Djob.log.dir=path/to/log/dir -Dconfig.file=/path/to/config/file -jar upgrader-[x.x.x.x].jar [fromVersion] [toVersion] [executeTime]` 启动工具,再根据命令行提示输入与具体版本升级任务相关的特定参数,运行升级工具。

/path/to/log/dir用于指定工具日志保存路径,通常为${BK_HOME}/logs/job
/path/to/config/file用于指定工具读取的配置文件,该配置文件由部署脚本自动渲染生成,路径为${BK_HOME}/etc/job/upgrader/upgrader.properties
fromVersion为当前作业平台版本,如3.2.7.3
toVersion为目标作业平台版本,如3.3.4.0
executeTime为升级任务执行的时间点,取值为BEFORE_UPDATE_JOB、AFTER_UPDATE_JOB,在更新作业平台进程前执行本工具填写BEFORE_UPDATE_JOB,更新进程后执行则填写AFTER_UPDATE_JOB

示例:
Job进程更新前:
```shell script
/opt/java/bin/java -Dfile.encoding=utf8 -Djob.log.dir=/data/bkee/logs/job -Dconfig.file=/data/bkee/etc/job/upgrader/upgrader.properties -jar upgrader-3.3.4.0.jar 3.2.7.3 3.3.4.0 BEFORE_UPDATE_JOB
```
Job进程更新后:
```shell script
/opt/java/bin/java -Dfile.encoding=utf8 -Djob.log.dir=/data/bkee/logs/job -Dconfig.file=/data/bkee/etc/job/upgrader/upgrader.properties -jar upgrader-3.3.4.0.jar 3.2.7.3 3.3.4.0 AFTER_UPDATE_JOB
```
Loading