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.

Sign up for GitHub

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

Jump to bottom

hotfix:高危语句规则页面增加搜索等通用操作 #1345 #8

Open
wants to merge 77 commits into
base: 3.6.x_dev_local
Choose a base branch
from
Open

hotfix:高危语句规则页面增加搜索等通用操作 #1345 #8

wants to merge 77 commits into from

Conversation

liuliaozhong
Copy link
Owner

No description provided.

liuliaozhong and others added 30 commits February 23, 2023 17:12
@liuliaozhong
bugfix: 修复log4j1.x配置代码执行漏洞(CVE-2021-4104) TencentBlueKing#1756
6d3640b
@liuliaozhong
bugfix: 修复log4j1.x配置代码执行漏洞(CVE-2021-4104) TencentBlueKing#1756
7e89f6e
@jsonwan
Merge pull request TencentBlueKing#1761 from liuliaozhong/3.6.x
54686a5 
bugfix: 修复log4j1.x配置代码执行漏洞(CVE-2021-4104) TencentBlueKing#1756
@hLinx
bugfix: 文本溢出交互规范 TencentBlueKing#1766
984f2d0
@hLinx
bugfix: 执行历史的“任务状态”字段枚举选项缺少一个“状态异常” TencentBlueKing#1763
764668d
@hLinx
feature: 搜索为空样式规范 TencentBlueKing#1767
fd98a2b
@hLinx
feature: 搜索为空样式规范 TencentBlueKing#1767
cc6041b
@hLinx
feature: 搜索为空样式规范 TencentBlueKing#1767
938c488
@hLinx
Merge pull request TencentBlueKing#1770 from hLinx/hotfix_3.6.x
ff535c3 
Hotfix 3.6.x
@liuliaozhong
Merge branch '3.6.x' of github.com:Tencent/bk-job into 3.6.x
61ecbac
@jsonwan
bugfix: 创建定时任务时使用执行方案中的默认密文变量不生效 TencentBlueKing#1764
cdd4177
@jsonwan
Merge pull request TencentBlueKing#1790 from jsonwan/3.6.x
ff658f6 
bugfix: 创建定时任务时使用执行方案中的默认密文变量不生效 TencentBlueKing#1764
@jsonwan
docs: 更新版本日志 TencentBlueKing#336
3ca7628
@jsonwan
Merge pull request TencentBlueKing#1797 from jsonwan/3.6.x
9209939 
docs: 更新版本日志 TencentBlueKing#336
@jsonwan
bugfix: k8s Service的metadata中含有null key时，导致服务状态接口报错 TencentBlueKing#1694
4f7398a 


1.根据关键字提前过滤serviceId，避免对非Job的Service进行解析；
2.打印k8s Service的metaData时提前去除null key避免序列化失败；
3.抽取日志打印方法捕获异常避免影响主流程。
@jsonwan
Merge pull request TencentBlueKing#1801 from jsonwan/3.6.x
dcc9a42 
bugfix: k8s Service的metadata中含有null key时，导致服务状态接口报错 TencentBlueKing#1694
@hLinx
bugfix: 切换页面tooltips不消失 TencentBlueKing#1807
96d4229
@hLinx
Merge pull request TencentBlueKing#1809 from hLinx/hotfix_3.6.x
f601489 
bugfix: 切换页面tooltips不消失 TencentBlueKing#1807
@jsonwan
bugfix: 去除k8s负载中重复定义的环境变量 TencentBlueKing#1828
89101cd 
job-file-worker statefulset
@jsonwan
Merge pull request TencentBlueKing#1830 from jsonwan/3.6.x
9b3c32f 
bugfix: 去除k8s负载中重复定义的环境变量 TencentBlueKing#1828
@hLinx
bugfix: 前端国际化补充 TencentBlueKing#1837
0927b6a
@hLinx
Merge pull request TencentBlueKing#1838 from hLinx/hotfix_3.6.x
3e2a090 
bugfix: 前端国际化补充 TencentBlueKing#1837
@jsonwan
bugfix: 去除k8s负载中重复定义的环境变量 TencentBlueKing#1828
65a26bb 
更改statefulset中的环境变量名称，规避去除重复环境变量后注入丢失的问题
@jsonwan
perf: 前后端域名统一 TencentBlueKing#744
0a5c8db 
前端与Web API统一使用主站域名
@wangyu096
Merge pull request TencentBlueKing#1845 from jsonwan/github_perf/doma…
06ae3df 
…in_unify_3.6

perf: 前后端域名统一 TencentBlueKing#744
@wangyu096
Merge pull request TencentBlueKing#1844 from jsonwan/3.6.x
66125ca 
bugfix: 去除k8s负载中重复定义的环境变量 TencentBlueKing#1828
@liuliaozhong
Merge branch 'TencentBlueKing:3.6.x' into 3.6.x
eafcdf6
@wangyu096
bugfix: 脚本引用密文变量不生效 TencentBlueKing#1853
5d4009f
@hLinx
format: 前端代码格式处理 TencentBlueKing#1854
55a06eb
@hLinx
format: 前端代码格式处理 TencentBlueKing#1854
bc1458c
liuliaozhong and others added 29 commits March 27, 2023 18:37
@liuliaozhong
bugfix: 作业执行详情-关键字包含特殊字符，检索执行日志报内部错误 TencentBlueKing#1741
215f49d
@liuliaozhong
bugfix: 作业执行详情-关键字包含特殊字符，检索执行日志报内部错误 TencentBlueKing#1741
3e0fe7b
@wangyu096
Merge pull request TencentBlueKing#1873 from liuliaozhong/3.6.x_issue…
0fd7373 
…1741

bugfix: 作业执行详情-关键字包含特殊字符，检索执行日志报内部错误 TencentBlueKing#1741
@liuliaozhong
perf: 首页Agent状态分布统计接口性能优化 TencentBlueKing#745
e518c56
@jsonwan
Merge pull request TencentBlueKing#1884 from liuliaozhong/3.6.x
86fca21 
perf: 首页Agent状态分布统计接口性能优化 TencentBlueKing#745
@hLinx
bugfix: 本地文件上传失败前端显示问题 TencentBlueKing#1887
9700f76
@hLinx
Merge pull request TencentBlueKing#1889 from hLinx/hotfix_3.6.x
0839269 
bugfix: 本地文件上传失败前端显示问题 TencentBlueKing#1887
@liuliaozhong
bugfix: job上传大文件失败 TencentBlueKing#1784
9f8ec8b
@wangyu096
Merge pull request TencentBlueKing#1892 from liuliaozhong/3.6.x
e2bf37b 
bugfix: job上传大文件失败 TencentBlueKing#1784
@jsonwan
docs: 更新版本日志 TencentBlueKing#336
79ece11
@jsonwan
Merge pull request TencentBlueKing#1896 from jsonwan/3.6.x
f510c3d 
docs: 更新版本日志 TencentBlueKing#336
@hLinx
bugfix: 前端国际化补充 TencentBlueKing#1837
f8b8176
@hLinx
bugfix: 新建标签按钮失效,点击无反应 TencentBlueKing#1897
3199ff7
@hLinx
bugfix: 前端国际化补充 TencentBlueKing#1837
c4b70d5
@hLinx
Merge pull request TencentBlueKing#1898 from hLinx/hotfix_3.6.x
c504802 
Hotfix 3.6.x
@liuliaozhong
bugfix: 修复Apache Commons FileUpload安全漏洞(CVE-2023-24998) TencentBlueKi…
30da1da 
…ng#1901
@hLinx
bugfix: IP白名单列表增加备注列 TencentBlueKing#1902
ab70b7d
@hLinx
Merge pull request TencentBlueKing#1904 from hLinx/hotfix_3.6.x
423e73f 
bugfix: IP白名单列表增加备注列 TencentBlueKing#1902
@wangyu096
Merge pull request TencentBlueKing#1903 from liuliaozhong/3.6.x_fileu…
08f26cb 
…pload

bugfix: 修复Apache Commons FileUpload安全漏洞(CVE-2023-24998) TencentBlueKing#1901
@liuliaozhong
bugfix: 修复Apache Commons FileUpload安全漏洞(CVE-2023-24998) TencentBlueKi…
312114b 
…ng#1901
@wangyu096
Merge pull request TencentBlueKing#1910 from liuliaozhong/3.6.x
341ec21 
bugfix: 修复Apache Commons FileUpload安全漏洞(CVE-2023-24998) TencentBlueKing#1901
@jsonwan
bugfix: 在CMDB跨业务转移主机后从ESB接口立即使用报主机无效 TencentBlueKing#1909
832d1cd 
在其他业务下的主机根据CMDB实时数据进行二次判定
@jsonwan
bugfix: 在CMDB跨业务转移主机后从ESB接口立即使用报主机无效 TencentBlueKing#1909
c837f63 
在其他业务下的主机根据CMDB实时数据进行二次判定
@jsonwan
bugfix: 在CMDB跨业务转移主机后从ESB接口立即使用报主机无效 TencentBlueKing#1909
99aec7c 
重构代码，降低圈复杂度
@jsonwan
Merge pull request TencentBlueKing#1912 from jsonwan/github_fix/host_…
32a381e 
…invalid

bugfix: 在CMDB跨业务转移主机后从ESB接口立即使用报主机无效 TencentBlueKing#1909
@jsonwan
perf: RestTemplate去除对SSLv2Hello与SSLv3协议的支持 TencentBlueKing#1915
4363942 
去除对SSLv2Hello与SSLv3协议的支持，使用JDK默认支持的协议
@wangyu096
Merge pull request TencentBlueKing#1916 from jsonwan/3.6.x
32c1072 
perf: RestTemplate去除对SSLv2Hello与SSLv3协议的支持 TencentBlueKing#1915
@liuliaozhong
bugfix: 【一般】高危语句规则页面增加搜索？排序？等通用操作，要不然，多了的话，怎么管理？ TencentBlueKing#1345
a771d1b
@liuliaozhong
hotfix:高危语句规则页面增加搜索等通用操作 TencentBlueKing#1345
a8797e9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@liuliaozhong @jsonwan @hLinx @wangyu096