lidongy
98e83ab7d0
Merge branch 'release/11.0' of https://code.fineres.com/scm/~lidongy/base-third into release/11.0
3 years ago
lidongy
4f073f56b7
KERNEL-9267 拆分third.jar为third.jar + cbb.jar
3 years ago
superman
7f73932f0e
Merge pull request #4977 in CORE/base-third from release/11.0 to feature/x
...
* commit '06190b1745b2fbb58d4cb7ce8a52fa3fb4ab94d4':
3 years ago
superman
06190b1745
Merge pull request #4968 in CORE/base-third from feature/x to release/11.0
...
* commit '79e6279fb946fef690dc4710f799a2d34698ddff':
BI-100757 fix:使用自定义驱动,mysql数据连接连接不上
无JIRA任务 fix: 添加essential依赖
KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j
3 years ago
Roger.Chen
79e6279fb9
Pull request #4929 : BI-100757 fix:使用自定义驱动,mysql数据连接连接不上
...
Merge in CORE/base-third from ~ROGER.CHEN/base-third:feature/x to feature/x
* commit '121adcc91c3e45be7658baa0cbc7d07a4bfa311b':
BI-100757 fix:使用自定义驱动,mysql数据连接连接不上
3 years ago
Roger.Chen
121adcc91c
BI-100757 fix:使用自定义驱动,mysql数据连接连接不上
3 years ago
superman
3dc377983c
Merge pull request #4775 in CORE/base-third from release/11.0 to feature/x
...
* commit '4a9a5adb9baeb61ecfb4b563e2f487ce769914be':
3 years ago
superman
4a9a5adb9b
Merge pull request #4774 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'afc4645a6b9c50da998f5584d40a759118539392':
3 years ago
superman
afc4645a6b
Merge pull request #4773 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'd08805c599df9459eb01768ee07c926b3024b614':
3 years ago
superman
d08805c599
Merge pull request #4766 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '40522e5b5702ed3cc8fabf522add55093dfa818a':
3 years ago
superman
d0cd8c8ef8
Merge pull request #4765 in CORE/base-third from release/11.0 to feature/x
...
* commit '4a5b49eef5f68914163073ea5005b3cfd4ca5105':
3 years ago
superman
4a5b49eef5
Merge pull request #4764 in CORE/base-third from final/11.0 to release/11.0
...
* commit '40522e5b5702ed3cc8fabf522add55093dfa818a':
3 years ago
superman
40522e5b57
Merge pull request #4763 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'd5d46d8bb3830250eb4c184215483f59e48daa8a':
3 years ago
superman
d5d46d8bb3
Merge pull request #4756 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '6ce073557ffb6dcf064f5ad0d9a430f7ad981037':
DEC-22165 fix: 移除pom.xml
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
c9305c7aff
Merge pull request #4718 in CORE/base-third from release/11.0 to feature/x
...
* commit '12731339126a4891922469c1ef3455e4867d56f0':
3 years ago
superman
1273133912
Merge pull request #4717 in CORE/base-third from final/11.0 to release/11.0
...
* commit '6ce073557ffb6dcf064f5ad0d9a430f7ad981037':
3 years ago
superman
6ce073557f
Merge pull request #4709 in CORE/base-third from release/11.0 to final/11.0
...
* commit '16b88e6b0bdd65ad5ac238589e0c2a45abd53b38':
DEC-22165 fix: 移除pom.xml
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
a008523b07
Merge pull request #4708 in CORE/base-third from release/11.0 to feature/x
...
* commit '16b88e6b0bdd65ad5ac238589e0c2a45abd53b38':
DEC-22165 fix: 移除pom.xml
3 years ago
Cloud.Liu
16b88e6b0b
Pull request #4697 : DEC-22165 fix: 移除pom.xml
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/11.0 to release/11.0
* commit 'e750fd485f52dad70e6dde0f321da98c111ccffe':
DEC-22165 fix: 移除pom.xml
3 years ago
Cloud.Liu
e750fd485f
DEC-22165 fix: 移除pom.xml
3 years ago
Cloud.Liu
03454716cd
Pull request #4687 : 无JIRA任务 fix: 添加essential依赖
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:feature/x to feature/x
* commit '370530faf154f74a4e1d15493594dee1ead4b6e1':
无JIRA任务 fix: 添加essential依赖
3 years ago
Cloud.Liu
370530faf1
无JIRA任务 fix: 添加essential依赖
3 years ago
Dylan.Liu
2d1c59e818
Pull request #4644 : KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j
...
Merge in CORE/base-third from ~DYLAN.LIU/base-third:feature/x to feature/x
* commit '6c73c85aa780ffbb02d9834551671a75980edc39':
KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j
3 years ago
superman
204720c038
Merge pull request #4677 in CORE/base-third from release/11.0 to feature/x
...
* commit 'eb20e08272e88ed095a97968202ae2b20b356fff':
3 years ago
superman
eb20e08272
Merge pull request #4676 in CORE/base-third from final/11.0 to release/11.0
...
* commit '232dfed99998c04f47d116e1ee74f0c8e9a410ac':
3 years ago
superman
232dfed999
Merge pull request #4675 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '6c09f3581d0bcb2ac941124931b8b65f906e4757':
3 years ago
superman
6c09f3581d
Merge pull request #4668 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '8589506d9daf00e7a3e8d3a716ba34b03d36f8bf':
3 years ago
superman
66a4f972c8
Merge pull request #4667 in CORE/base-third from release/11.0 to feature/x
...
* commit '9f2170bd888fc1a6e0948f3f83d5aac0b8887136':
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
9f2170bd88
Merge pull request #4643 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'f0b9f7989a5001aa8fecd71daefdb3477da7e0f0':
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
dylan.liu
6c73c85aa7
KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j
3 years ago
superman
f0b9f7989a
Merge pull request #4641 in CORE/base-third from final/10.0 to release/10.0
...
* commit '23f0b24f382c0c01b567d35543ec58aa236f1afa':
3 years ago
Link.Zhao
107c7b91ea
Pull request #4628 : REPORT-63790 日志同步插件-check_table失败导致同步失败
...
Merge in CORE/base-third from ~LINK.ZHAO/base-third:release/10.0 to release/10.0
* commit 'b421619bc08246422657468b76beaccd32fdab5f':
REPORT-63790 日志同步插件-check_table失败导致同步失败 1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
23f0b24f38
Merge pull request #4638 in CORE/base-third from release/10.0 to final/10.0
...
* commit '62409052b196ee22a839dd13054a9576e04f5322':
3 years ago
superman
62409052b1
Merge pull request #4636 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'c23a7b6d52c0031f178138bc74cd7c7838c304c4':
3 years ago
Link.Zhao
b421619bc0
REPORT-63790
...
日志同步插件-check_table失败导致同步失败
1、catalog为空字符串会导致sqlserver的 sp_tables 语句无法执行
3 years ago
superman
a64077c048
Merge pull request #4622 in CORE/base-third from release/11.0 to feature/x
...
* commit 'c8608aebf90329b4ef73fd3b52b761eedd4c723b':
3 years ago
superman
c8608aebf9
Merge pull request #4621 in CORE/base-third from final/11.0 to release/11.0
...
* commit '8589506d9daf00e7a3e8d3a716ba34b03d36f8bf':
3 years ago
superman
8589506d9d
Merge pull request #4620 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '3b31f49fdd4b0de70908866bcc1c9614b3c426f2':
3 years ago
superman
3b31f49fdd
Merge pull request #4612 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '110ee6c26f2c84bd949f0f70493aa88b96f1d50b':
3 years ago
superman
4bc5170fed
Merge pull request #4591 in CORE/base-third from release/11.0 to feature/x
...
* commit '9b8f082d524649bb2cc669726359c5134d489f9e':
DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
3 years ago
superman
9b8f082d52
Merge pull request #4590 in CORE/base-third from final/11.0 to release/11.0
...
* commit '110ee6c26f2c84bd949f0f70493aa88b96f1d50b':
DEC-22102 fix:【专题】11.0工程,数据连接管理,INFORMIX数据连接失败,驱动管理上传可以成功
3 years ago
superman
110ee6c26f
Merge pull request #4589 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '8a1d84a0e1e02ed7eedf7a8ecfdeab6afc075f00':
3 years ago
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