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

merge: 3.8.x to master #3134 #3135

Merged
merged 14 commits into from
Aug 22, 2024
Merged

merge: 3.8.x to master #3134 #3135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
97a793e
fix: axios 版本升级 #2883
hLinx Apr 10, 2024
6f573c2
Merge pull request #2884 from hLinx/hotfix_3.7.x
hLinx Apr 10, 2024
525d433
feat: 修复第三方组件安全漏洞 #2865
liuliaozhong Apr 10, 2024
40179ea
Merge pull request #2887 from liuliaozhong/3.7.x_issue_2865
jsonwan Apr 10, 2024
c290fd7
fix: 侧边导航展开收起页面错乱 #3021
hLinx Jun 3, 2024
d871b62
fix: 编辑 IP 白名单目标业务为全范围时已选目标业务没有重置 #3022
hLinx Jun 3, 2024
3b4fb14
Merge pull request #3023 from hLinx/hotfix_3.8.x
hLinx Jun 3, 2024
2c076ef
feat: 修复第三方组件安全漏洞 #2865
liuliaozhong Jul 16, 2024
8d5bbc1
Merge pull request #3126 from liuliaozhong/3.7.x_issue_2865_2407
wangyu096 Jul 17, 2024
c03a6bb
merge: 3.7.x to 3.8.x #3134
liuliaozhong Jul 18, 2024
e7b9245
Merge pull request #3133 from liuliaozhong/3.8.x
wangyu096 Jul 18, 2024
240d179
fix: jcommander报错 #3130
liuliaozhong Aug 22, 2024
df9d0e1
Merge pull request #3176 from liuliaozhong/3.7.x_issue3130
jsonwan Aug 22, 2024
fa419e3
Merge pull request #3177 from TencentBlueKing/3.7.x
jsonwan Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,14 @@ ext {
set('otelJdbcVersion', "1.24.0-alpha")
set('commonsValidatorVersion', "1.6")
set('okHttpVersion', "4.9.1")
set('jcommanderVersion', "1.71")
set('jcommanderVersion', "1.72")
set('kubernetesJavaClientVersion', "11.0.4")
set('springCloudKubernetesVersion', "2.0.6")
set('cryptoJavaSDKVersion', "1.1.3")
// Fix CVE-2023-44487
set('tomcat.version', "9.0.90")
// Fix CVE-2019-10086,CVE-2014-0114
set('commonsBeanutilsVersion', "1.9.4")
if (System.getProperty("bkjobVersion")) {
set('bkjobVersion', System.getProperty("bkjobVersion"))
println "bkjobVersion:" + bkjobVersion
Expand Down Expand Up @@ -289,6 +293,7 @@ subprojects {
dependency "commons-collections:commons-collections:$commonsCollectionsVersion"
dependency "commons-io:commons-io:$commonsIOVersion"
dependency "commons-codec:commons-codec:$apacheCommonsCodecVersion"
dependency "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion"
dependency "net.sf.dozer:dozer:$dozerVersion"
dependency "org.jedis:jedis:$jedisVersion"
dependency "com.h2database:h2:$h2Version"
Expand Down
2 changes: 1 addition & 1 deletion src/backend/commons/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ subprojects {
version "${jobCommonVersion}"
dependencies {
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
compileOnly 'ch.qos.logback:logback-classic:1.1.11'
compileOnly 'ch.qos.logback:logback-classic:1.3.14'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.junit.jupiter:junit-jupiter'
Expand Down
5 changes: 4 additions & 1 deletion src/frontend/src/components/site-frame/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@
}

.jb-navigation-side {
position: relative;
transition: none;
}

Expand Down Expand Up @@ -283,7 +284,9 @@
}

.jb-navigation-side {
position: relative;
position: absolute;
bottom: 0;
left: 0;
z-index: 2000;
display: flex;
float: left;
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/views/white-ip/index/components/operation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
if (params.id < 1) {
delete params.id;
}
if (params.allScopeh) {
if (params.allScope) {
params.scopeList = [];
} else {
params.scopeList = this.scopeValue.map((scopeLocalKey) => {
Expand Down
24 changes: 12 additions & 12 deletions support-files/dependJarInfo/md5List.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ a77a4f0e9645fb5e17fb17f8b1c7cc1b
5725bdda5da45c1a62c385dcb77c7fed
a4d97c5a2f94b8b5d132761a769e5eeb
c6f7fe841c62cbbeeede7510fe8d72ee
1d172df000184d005b49bc6d30892a05
1809d0449a6374279c01fdd3be26cd92
1fbcaeee655ec252afc9233d04c8ebe1
a96b369566dce549d0f4ccfc68df1ea3
53802337d51998f11f9614b6a104710d
Expand All @@ -23,7 +23,7 @@ a6e02ea9a5acdc1a31df04d13f3ddc94
45fd4a89c9fd671a0d1dc97c0ec77abe
ef26289b4355269fa45ca0174d4d6652
e91fcd30ba329fd1b0b6dc5321fd067c
d095339044d22475f8b1fea1b626d3bb
07dc532ee316fe1f2f0323e9bd2f8df4
e9158e0983096d3df09236f7b53125aa
f54a8510f834a1a57166970bfc982e94
4a37023740719b391f10030362c86be6
Expand Down Expand Up @@ -53,17 +53,17 @@ b53954fc8475542d5740dc0315556ea7
bb1517da5023eadbd4a78ca836723525
b1f2b595c174b2e399416a9f26f6dbad
f2aa34cc77e2f7839735ec79592e1b00
367221dde0ef94ea3507928ef40cbe75
40d6b9075fbd28fa10292a45a0db9457
e07a248f61c52776a2366c075dcd4963
d1bf2df33d7ae4dcfc12a6b1956d3e4c
5fa4ec4ec0c5aa70af8a7d4922df1931
fb3fd29c5c990b78c8d1b40b9e8839de
1cf7bf96372fd34cb4a450f19d8e706b
14fd0effa4d1d3e09edb36423be82aff
8ce4743e07d8553fb8b57558973de9f7
a43cefe1a03a5a6f1967b5832873b123
10fc883f659e2407ea2639fe6dd5b112
eed352dcdf5b22864084e25ed0671e84
0b1245f3245cbfa53e61d9d366006041
2272453c780d1383ecd2efde00c1a7a9
1dbb98839964a6967a428d868b2d8714
fef4733925c9b64b00996ed874be2075
3803e35b61c5812310fd093c398b43b6
712138e14895b15181e0b9af3292e222
5c28a6ef0d19bcc62976eea35714047e
1cbb480310fa1987f9db7a3ed7118af7
8b165cf58df5f8c2a222f637c0a07c97
6bb54dbf912bf1b6c79592838db76b51
Expand Down Expand Up @@ -240,8 +240,8 @@ bd3d55991beef2ca5e98ee61215c33da
34d27cb411e654f3c2b69bf536984e77
619f94ec2cfa0276622657810eada472
9a816507533880637936bee8c27b238e
f98862daa7adeddd61eaa61c7ad34d45
740cac5cd193b77996ba82572e10cde8
8d88f2789df4b14b66d4d8616415dc9f
7fe523958297c4c99834d8d9c8250d6a
09c19f22d438019835b1f5c0adc0403a
b569cef884a2f96deb03c96362d53a01
3401964a9fc0e0772ab6623b37749d8c
22 changes: 11 additions & 11 deletions support-files/dependJarInfo/versionList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
0.9.5.4
2.10.0
1.5.1
1.9.1
1.9.4
1.14
3.2.2
4.4
Expand Down Expand Up @@ -53,17 +53,17 @@
3.4.5
2.4.13
2.1.0.RELEASE
4.5.10
4.5.13
4.4.13
1.5.18
1.3
2.11.2
2.11.2
2.11.2
2.11.2
2.11.2
2.11.2
2.11.2
2.13.5
2.13.5
2.13.5
2.13.5
2.13.5
2.13.5
2.13.5
1.2.2
1.3.5
3.0.3
Expand Down Expand Up @@ -240,8 +240,8 @@
2.9.2
1.5.20
1.5.20
9.0.38
9.0.38
9.0.90
9.0.90
2.19.3
2.12.1
2.12.1
Loading