superman
1cf07522b3
Merge pull request #4244 in CORE/base-third from release/11.0 to feature/x
...
* commit '850cfe1db35dda890fb644a0965200e06e3d175a':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
850cfe1db3
Merge pull request #4239 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'd437da7a205f93ce533004f00e404bcefebabc4c':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
d437da7a20
Merge pull request #4234 in CORE/base-third from feature/10.0 to release/10.0
...
* commit 'bed893a89aff637b21b299a4479a561502c754ec':
3 years ago
Cloud.Liu
26748dd473
Pull request #4223 : DEC-20671 fix: was下请求服务器数据失败
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'e90d644b999ff908decd3268a367963824a8862b':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
Cloud.Liu
e90d644b99
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
01a642eb5f
Merge pull request #4212 in CORE/base-third from release/11.0 to feature/x
...
* commit '8d90b00c480718e09fb865b92c567b31b6987a4d':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
8d90b00c48
Merge pull request #4211 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'c9c0efca29dc92f5d7997aeefe0c22fadfa00562':
3 years ago
superman
c9c0efca29
Merge pull request #4202 in CORE/base-third from release/11.0 to final/11.0
...
* commit 'f235bd524a4df12eec045bfd17e7c3fab4853d4e':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
REPORT-60245 fix: TongWeb启动失败
3 years ago
Cloud.Liu
f235bd524a
Pull request #4201 : 无JIRA任务 revert: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/11.0 to release/11.0
* commit '49f4901002f0d75d7f0f50830219b7be241725ba':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
49f4901002
Revert "DEC-21348 fix: java security适配"
...
This reverts commit f3d9c60d87
.
3 years ago
superman
e2c6eaa69f
Merge pull request #4200 in CORE/base-third from release/11.0 to feature/x
...
* commit '1648698d336c7df51b3a89f345a936d21c6be2d6':
DEC-21348 fix: java security适配
3 years ago
superman
bed893a89a
Merge pull request #4196 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'dcaba51fbd3274ea365aa4c0497d0e7388046151':
DEC-21348 fix: java security适配
3 years ago
superman
1648698d33
Merge pull request #4195 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'd2514e9e61ebeee6ef079ce3a88c4fdcb4021303':
DEC-21348 fix: java security适配
3 years ago
superman
dcaba51fbd
Merge pull request #4194 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'd2514e9e61ebeee6ef079ce3a88c4fdcb4021303':
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
d2514e9e61
Pull request #4160 : DEC-21348 fix: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'f3d9c60d875e898fc3898e18b3368b608b5c78a4':
DEC-21348 fix: java security适配
3 years ago
superman
a5999fc263
Merge pull request #4186 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '58048fd89546a7eee469f2beb74b56dc1eb9056e':
3 years ago
superman
58048fd895
Merge pull request #4175 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'b14733d9e2cf817740f4ecf3e9e693e72508e844':
3 years ago
superman
948db39903
Merge pull request #4181 in CORE/base-third from release/11.0 to feature/x
...
* commit 'afe40313af258e08cc5a00227fedec3c8cd75c14':
3 years ago
superman
afe40313af
Merge pull request #4176 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'b14733d9e2cf817740f4ecf3e9e693e72508e844':
3 years ago
superman
b14733d9e2
Merge pull request #4174 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'e0f1ac4dcb1a6c7849b7d12f837bcc97c0989e22':
3 years ago
superman
e0f1ac4dcb
Merge pull request #4173 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '666dcd1616bad40ee0e27670aa07c0c123ee98f8':
3 years ago
superman
666dcd1616
Merge pull request #4166 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'e14db4b6e586618034909fd6cc18114d2596183d':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
f3d9c60d87
DEC-21348 fix: java security适配
3 years ago
lidongy
23ab285be5
Pull request #4102 : KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
...
Merge in CORE/base-third from ~LIDONGY/base-third:feature/x to feature/x
* commit '6e5b5ef1dfbd5f02108ce8323e82cab8096f69d7':
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago
superman
40b6edfa5a
Merge pull request #4149 in CORE/base-third from release/11.0 to feature/x
...
* commit 'd42c43699155a73a77cefa7762d3c4c4908e1fd5':
3 years ago
superman
2c7bfb0246
Merge pull request #4145 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '039645e06cb94e819913f441cb1aa527d5796d35':
3 years ago
superman
d42c436991
Merge pull request #4144 in CORE/base-third from release/10.0 to release/11.0
...
* commit '9b8e625b20cf81b904cf17b9a4b268654c579bf9':
3 years ago
superman
039645e06c
Merge pull request #4143 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '9b8e625b20cf81b904cf17b9a4b268654c579bf9':
3 years ago
superman
9b8e625b20
Merge pull request #4142 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'e14db4b6e586618034909fd6cc18114d2596183d':
3 years ago
superman
5a81aa6e58
Merge pull request #4139 in CORE/base-third from feature/x to release/11.0
...
* commit 'a859aca8bf45c1b6c3ae0622089211543a36fe7a':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
e14db4b6e5
Merge pull request #4138 in CORE/base-third from release/10.0 to final/10.0
...
* commit 'b0396d8ba49a88c15e8691ff15ea9e1628d280ee':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
3 years ago
superman
b0396d8ba4
Merge pull request #4137 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'e4d9ae777cdbaa6f8079424ff2f0815a2671f141':
3 years ago
superman
a859aca8bf
Merge pull request #4115 in CORE/base-third from release/11.0 to feature/x
...
* commit '6aabee6b251f1f3a9c0a34c462a58396cda33bda':
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
4e5b5eb588
Merge pull request #4111 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'e4d9ae777cdbaa6f8079424ff2f0815a2671f141':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
6aabee6b25
Merge pull request #4110 in CORE/base-third from release/10.0 to release/11.0
...
* commit '7c93f3306ab6f4901a7d7a89bbd8cbe362b6f467':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
e4d9ae777c
Merge pull request #4109 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '7c93f3306ab6f4901a7d7a89bbd8cbe362b6f467':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
905fe70420
Pull request #4105 : DEC-21348 revert: 回退java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/11.0 to release/11.0
* commit '2dc8bfe48bddc69132a67cb01fcb8fb19d79040a':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
6ce80eee0a
Pull request #4104 : DEC-21348 revert: 回退java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:feature/x to feature/x
* commit '5a37fe8c5519dcddfb35eb3a685f2ecaba287ab4':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
7c93f3306a
Pull request #4103 : DEC-21348 revert: 回退java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '063e6e14ff53184001ec8a994a7c95bfd9491033':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
2dc8bfe48b
Revert "DEC-21348 fix: java security适配"
...
This reverts commit 3b3bef3221
.
3 years ago
Cloud.Liu
5a37fe8c55
Revert "DEC-21348 fix: java security适配"
...
This reverts commit 3b3bef3221
.
3 years ago
Cloud.Liu
063e6e14ff
Revert "DEC-21348 fix: java security适配"
...
This reverts commit 3b3bef3221
.
3 years ago
lidongy
6e5b5ef1df
Merge branch 'feature/x' of https://code.fineres.com/scm/~lidongy/base-third into feature/x
3 years ago
lidongy
a791810fec
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago
superman
5ea9e5ab90
Merge pull request #4081 in CORE/base-third from release/11.0 to feature/x
...
* commit '0a7000273eacbce65e319bbfb17d7a4ae45c1945':
DEC-21348 fix: java security适配
3 years ago
superman
909a1c36f1
Merge pull request #4077 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '2671aee870fd8630ca19b4a7b8996f7e7029dd73':
DEC-21348 fix: java security适配
3 years ago
superman
0a7000273e
Merge pull request #4076 in CORE/base-third from release/10.0 to release/11.0
...
* commit '4a123eca18367af6acd484f3c6155b45087f4189':
DEC-21348 fix: java security适配
3 years ago
superman
2671aee870
Merge pull request #4075 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '4a123eca18367af6acd484f3c6155b45087f4189':
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
4a123eca18
Pull request #4071 : DEC-21348 fix: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '3b3bef32210895d6b5d59a6a506d3237b1d6cba5':
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
3b3bef3221
DEC-21348 fix: java security适配
3 years ago