superman
8a1d84a0e1
Merge pull request #4581 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'f0542404202ed4c8e2fbe200ac3a5408b4797ada':
DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
无jira任务 fix: pom报错修复
无jira任务 fix: pom报错修复
KERNEL-9685 fix: log4j 版本升级
KERNEL-9861 fix: pom修复
KERNEL-9862 fix: druid对接slf4j
DEC-21348 fix: java security适配
无jira任务 fix: druid log4j适配
KERNEL-9685 refactor: log4j 版本升级
KERNEL-9862 补上被误删的代码
KERNEL-9862 druid log4j2的适配
KERNEL-9836 update: alibaba druid 版本升级
DEC-20671 fix: was下请求服务器数据失败
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago
lidongy
f054240420
Pull request #4580 : DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
...
Merge in CORE/base-third from ~LIDONGY/base-third:final/11.0 to final/11.0
* commit '4eb7f1770f2ffd2cd074e6026bd091b2eb7ac3b0':
DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
3 years ago
lidongy
4eb7f1770f
DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
3 years ago
superman
c1c8c466be
Merge pull request #4579 in CORE/base-third from release/11.0 to feature/x
...
* commit '67a3d5da3b225492c2854fc7d93ff86d096895a0':
3 years ago
superman
67a3d5da3b
Merge pull request #4578 in CORE/base-third from final/11.0 to release/11.0
...
* commit '34c1fd87cd4edd39a783f34bf3f4ddce73ebde41':
3 years ago
superman
34c1fd87cd
Merge pull request #4569 in CORE/base-third from release/11.0 to final/11.0
...
* commit '887a87ea3777c65fe7d9e4f3b2839f9773e81f33':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
无jira任务 fix: pom报错修复
无jira任务 fix: pom报错修复
KERNEL-9685 fix: log4j 版本升级
KERNEL-9861 fix: pom修复
KERNEL-9862 fix: druid对接slf4j
DEC-21348 fix: java security适配
无jira任务 fix: druid log4j适配
KERNEL-9685 refactor: log4j 版本升级
KERNEL-9862 补上被误删的代码
KERNEL-9862 druid log4j2的适配
KERNEL-9836 update: alibaba druid 版本升级
DEC-20671 fix: was下请求服务器数据失败
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago
superman
27a889be21
Merge pull request #4558 in CORE/base-third from release/11.0 to feature/x
...
* commit '887a87ea3777c65fe7d9e4f3b2839f9773e81f33':
3 years ago
superman
887a87ea37
Merge pull request #4553 in CORE/base-third from release/10.0 to release/11.0
...
* commit '86afff65eeca840aed6ef4990082bdc4d1d44a7f':
3 years ago
superman
c23a7b6d52
Merge pull request #4552 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '86afff65eeca840aed6ef4990082bdc4d1d44a7f':
3 years ago
superman
86afff65ee
Merge pull request #4551 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'cacb86c06327e3e200282533194e18d231527816':
3 years ago
superman
cacb86c063
Merge pull request #4550 in CORE/base-third from persist/10.0 to final/10.0
...
* commit 'f5ca43cad3125c2bcaf8ac6bf6b63ae70728e1ba':
3 years ago
superman
f5ca43cad3
Merge pull request #4548 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'db98bc16352b3b29bb583105dc28d7c519cc385a':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
92183493fe
Merge pull request #4537 in CORE/base-third from release/11.0 to feature/x
...
* commit 'dcb50b766562569166a136cc4395c774b06a0c6a':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
dcb50b7665
Merge pull request #4532 in CORE/base-third from release/10.0 to release/11.0
...
* commit '10e1166b56fe4ff80c383c5543cda25a86b2a56d':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
ceea546257
Merge pull request #4531 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '10e1166b56fe4ff80c383c5543cda25a86b2a56d':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
10e1166b56
Merge pull request #4530 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'db98bc16352b3b29bb583105dc28d7c519cc385a':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
lidongy
db98bc1635
Pull request #4506 : REPORT-64924 update: bouncycastle要求从1.67升级到1.68
...
Merge in CORE/base-third from ~LIDONGY/base-third:final/10.0 to final/10.0
* commit '9b044d0550375223f1f529b381b843a0b792057e':
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
60dcb908fc
Merge pull request #4516 in CORE/base-third from release/11.0 to feature/x
...
* commit 'b9ff9dfdb7a18742ca5ab916b8fe99093dc6f227':
3 years ago
superman
b9ff9dfdb7
Merge pull request #4511 in CORE/base-third from release/10.0 to release/11.0
...
* commit '732ee63352d2982c79ddccb76c8b5a049e019bc1':
3 years ago
lidongy
9b044d0550
REPORT-64924 update: bouncycastle要求从1.67升级到1.68
3 years ago
superman
b1e18cb9b3
Merge pull request #4504 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '732ee63352d2982c79ddccb76c8b5a049e019bc1':
3 years ago
superman
732ee63352
Merge pull request #4503 in CORE/base-third from final/10.0 to release/10.0
...
* commit '2dd49e03cb7913750404101780ccbea969af8167':
3 years ago
superman
2b62487e3c
Merge pull request #4500 in CORE/base-third from feature/x to release/11.0
...
* commit 'c5964c824c4f87410e4d21e637353c42e6283e56':
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
无jira任务 fix: pom报错修复
无jira任务 fix: pom报错修复
KERNEL-9685 fix: log4j 版本升级
KERNEL-9861 fix: pom修复
KERNEL-9862 fix: druid对接slf4j
DEC-21348 fix: java security适配
无jira任务 fix: druid log4j适配
KERNEL-9685 refactor: log4j 版本升级
KERNEL-9862 补上被误删的代码
KERNEL-9862 druid log4j2的适配
KERNEL-9836 update: alibaba druid 版本升级
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago
superman
2dd49e03cb
Merge pull request #4494 in CORE/base-third from release/10.0 to final/10.0
...
* commit '6b7aa2fd11ac4692fcfdf7f7fd03ae795e7a43e0':
3 years ago
superman
6b7aa2fd11
Merge pull request #4493 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '36d8beadcc4f90078e6a03f01fb33ba267921a1b':
3 years ago
Dylan.Liu
c5964c824c
Pull request #4432 : KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
...
Merge in CORE/base-third from ~DYLAN.LIU/base-third:feature/x to feature/x
* commit 'e1ce7bd3103de88a689a184a6dbd8363313e8176':
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9861 feat: 适配slf4j&&pom修复
KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
3 years ago
superman
54fb766a30
Merge pull request #4431 in CORE/base-third from release/11.0 to feature/x
...
* commit '34f59b631005258e8fd5f2277e12981325bbc191':
3 years ago
Dylan.Liu
e1ce7bd310
KERNEL-9861 feat: 适配slf4j&&pom修复
3 years ago
Dylan.Liu
b39d615e20
KERNEL-9861 feat: 适配slf4j&&pom修复
3 years ago
Dylan.Liu
da9cc81cbb
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Dylan.Liu
9adf72f72e
KERNEL-9835 fix: Apache HttpClient 安全漏洞, 升级到4.5.13
3 years ago
superman
34f59b6310
Merge pull request #4430 in CORE/base-third from final/11.0 to release/11.0
...
* commit '9847cbbafe1fb52973f41e6b6902f55628ccc5df':
3 years ago
superman
9847cbbafe
Merge pull request #4429 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'b6d9923649b6fa1c4406f1dcd6eeb25c2ebc191f':
3 years ago
Dylan.Liu
abe8ff0288
Pull request #4420 : 无jira任务 fix: pom报错修复
...
Merge in CORE/base-third from ~DYLAN.LIU/base-third:feature/x to feature/x
* commit '702685a6ed4db459fcb84bca9a20d205d1c8e99a':
无jira任务 fix: pom报错修复
无jira任务 fix: pom报错修复
3 years ago
superman
b6d9923649
Merge pull request #4421 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'e550a9b0d75024106b1cadf00f8af8a8e2577db4':
3 years ago
Dylan.Liu
702685a6ed
无jira任务 fix: pom报错修复
3 years ago
Dylan.Liu
2ab486a342
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Dylan.Liu
4cc29467e9
无jira任务 fix: pom报错修复
3 years ago
Dylan.Liu
7c6170e2fe
Pull request #4409 : KERNEL-9862 fix: druid对接slf4j&&pom修复
...
Merge in CORE/base-third from ~DYLAN.LIU/base-third:feature/x to feature/x
* commit '7c4692dcefe9a6cc6fe2cbd6b1ca2568b881bc4d':
KERNEL-9685 fix: log4j 版本升级
KERNEL-9861 fix: pom修复
KERNEL-9862 fix: druid对接slf4j
3 years ago
Dylan.Liu
7c4692dcef
KERNEL-9685 fix: log4j 版本升级
3 years ago
Dylan.Liu
cf491d539b
KERNEL-9861 fix: pom修复
3 years ago
Dylan.Liu
277d18bd79
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Dylan.Liu
98e85429e8
KERNEL-9862 fix: druid对接slf4j
3 years ago
Cloud.Liu
c2494fff6c
Pull request #4408 : DEC-21348 fix: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:feature/x to feature/x
* commit '9eb13d22f7a01086281864d623fbe2e085c48429':
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
9eb13d22f7
DEC-21348 fix: java security适配
3 years ago
superman
c6c7503b8a
Merge pull request #4407 in CORE/base-third from release/11.0 to feature/x
...
* commit 'a68a4612b2f0bfb4dcd417b9d92371802ccd9e62':
3 years ago
superman
a68a4612b2
Merge pull request #4406 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'e550a9b0d75024106b1cadf00f8af8a8e2577db4':
3 years ago
superman
e550a9b0d7
Merge pull request #4405 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '293e68ce2d273b219a1d61da60f7d758d8e5d2df':
3 years ago
superman
9dc9e01583
Merge pull request #4402 in CORE/base-third from release/10.0 to release/11.0
...
* commit '3af3602dbfcb756bafc1181c346f921e495ec2f7':
3 years ago
superman
36d8beadcc
Merge pull request #4401 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '3af3602dbfcb756bafc1181c346f921e495ec2f7':
3 years ago