superman
b3732a119d
Merge pull request #2313 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '23d1584c65917775f1a09aabb729f47aa8f42695':
4 years ago
superman
23d1584c65
Merge pull request #2312 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '0461ac473dce6f56ca6c43131b4351210646b17e':
4 years ago
superman
7c957a41ed
Merge pull request #2309 in CORE/base-third from feature/10.0 to feature/x
...
* commit 'b7feab875479f0c46c64b8923f9af26bef7aad31':
4 years ago
superman
b7feab8754
Merge pull request #2307 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '0461ac473dce6f56ca6c43131b4351210646b17e':
4 years ago
superman
0461ac473d
Merge pull request #2303 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '8543bef69f9d1cc5239ab37113a54441e6d6bdb7':
KERNEL-7725 feat: websocket提供全局拦截器
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
无jira任务 chore: 解决bugfix合并到feature的冲突
KERNEL-6189 fix: 修复third打包脚本
KERNEL-6189 chore: feature分支fine-third打包加入CBB
KERNEL-6151 fix: fine-third打包脚本修改
KERNEL-6151 feat: fine-third适配fine-essential并加入打包
KERNEL-5583 feat: 升级spring到4.3.29RELEASE
4 years ago
superman
8543bef69f
Merge pull request #2302 in CORE/base-third from feature/10.0 to bugfix/10.0
...
* commit '04f518520021ae2336a4e7f6d5181a023ebc02d8': (23 commits)
KERNEL-7725 feat: websocket提供全局拦截器
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
REPORT-50649 导出-生僻字导出问题 Excel导出
无jira任务 docs: 补充readme
无jira任务 chore: 解决bugfix合并到feature的冲突
KERNEL-6189 fix: 修复third打包脚本
KERNEL-6189 chore: feature分支fine-third打包加入CBB
KERNEL-6151 fix: fine-third打包脚本修改
KERNEL-6151 feat: fine-third适配fine-essential并加入打包
KERNEL-5583 feat: 升级spring到4.3.29RELEASE
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
...
4 years ago
superman
0a49c9f9d9
Merge pull request #2301 in CORE/base-third from feature/10.0 to feature/x
...
* commit '04f518520021ae2336a4e7f6d5181a023ebc02d8':
4 years ago
superman
04f5185200
Merge pull request #2299 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '31142c0a4a2804efd1411f5e3cc749314f6d1bf8':
4 years ago
superman
31142c0a4a
Merge pull request #2298 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'dbad5f7b6d683356e903c614509b9981e63e374e':
4 years ago
superman
dbad5f7b6d
Merge pull request #2297 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '9bf575e2de0842a119833a4a9fa1fa70d835f097':
4 years ago
superman
9bf575e2de
Merge pull request #2296 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '596b3a5496f0f6e2456334c8d2ce3439404e0e14':
4 years ago
superman
596b3a5496
Merge pull request #2295 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '986fb916bd1d8a08217d7b95ff5966553b795a3c':
4 years ago
superman
2412ed6262
Merge pull request #2293 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '986fb916bd1d8a08217d7b95ff5966553b795a3c':
4 years ago
superman
986fb916bd
Merge pull request #2292 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '414204eb235703ee76ee02127b1849c0deeec713':
4 years ago
superman
5cdfa903df
Merge pull request #2289 in CORE/base-third from feature/10.0 to feature/x
...
* commit '67baa0e2108076c74a0fd72af11563adeed07c09':
KERNEL-7725 feat: websocket提供全局拦截器
4 years ago
superman
414204eb23
Merge pull request #2290 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '26723923222c2d21d0fa0e10859a639b3b49d9fc':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Elijah
67baa0e210
Pull request #2283 : KERNEL-7725 feat: websocket提供全局拦截器
...
Merge in CORE/base-third from ~ELIJAH/base-third:feature/10.0 to feature/10.0
* commit 'c31c9160cd586194f43fe457604611dd410929a1':
KERNEL-7725 feat: websocket提供全局拦截器
4 years ago
Elijah
c31c9160cd
Pull request #3 : KERNEL-7725 feat: websocket提供全局拦截器
...
Merge in ~ELIJAH/base-third from release/10.0 to feature/10.0
* commit 'c95ac472b126cde2f383381e0db9e6666e5f54a5':
KERNEL-7725 feat: websocket提供全局拦截器
4 years ago
Elijah
c95ac472b1
KERNEL-7725 feat: websocket提供全局拦截器
4 years ago
superman
5f403ab78b
Merge pull request #2282 in CORE/base-third from feature/10.0 to feature/x
...
* commit 'eb835f7321a8951710e8ff73b2288d567a4a90e6':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
eb835f7321
Merge pull request #2280 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '1de780197b0e10e86f50836ddf074742c10948c6':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
1de780197b
Merge pull request #2279 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'fac54b3984d5911c2180e12a4ef34d3bdb2e2728':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
fac54b3984
Merge pull request #2278 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '26723923222c2d21d0fa0e10859a639b3b49d9fc':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Kara
2672392322
Pull request #2271 : DEC-17833 feat: CBB独立发布 third打包脚本修改
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:final/10.0 to final/10.0
* commit 'd655f39e09b17cdf49dcc33b41ff5182f7656654':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Cloud.Liu
33720a1d5c
Pull request #2270 : DEC-17833 feat: CBB独立发布 third打包脚本修改
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:bugfix/10.0 to bugfix/10.0
* commit '4ac355642842e5f240635975451e0b38125bb8a4':
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
DEC-17833 feat: CBB独立发布 third打包脚本修改
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Cloud.Liu
d655f39e09
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
4 years ago
Cloud.Liu
5b23d8b759
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Cloud.Liu
98b2208069
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Cloud.Liu
4ac3556428
DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
4 years ago
Cloud.Liu
1f7e8016bd
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
Cloud.Liu
4ac44b4691
DEC-17833 feat: CBB独立发布 third打包脚本修改
4 years ago
superman
011b0a2a59
Merge pull request #2263 in CORE/base-third from feature/10.0 to feature/x
...
* commit '5b40cdca25d3fd9aea1d1f9aa8f32bea89767dde':
4 years ago
superman
5b40cdca25
Merge pull request #2261 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '345eba1165bf222687145dc79c580772536c2046':
4 years ago
superman
345eba1165
Merge pull request #2260 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'def196a51a6da50f33560fffc188c13aba0b3b71':
4 years ago
superman
def196a51a
Merge pull request #2259 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '5293945004628d29261bae5e93268f60573d0fd5':
4 years ago
superman
5293945004
Merge pull request #2257 in CORE/base-third from bugfix/10.0 to final/10.0
...
* commit '6d7f40b9edc425a2270c124a27b41ef251479d98':
4 years ago
superman
4664c48cdd
Merge pull request #2238 in CORE/base-third from feature/10.0 to feature/x
...
* commit '8ab7742594e48561a5581835382ac4ba60811794':
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
4 years ago
superman
8ab7742594
Merge pull request #2236 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '6ec6da1d2b7d7740f449e8cefd7a44cc039d2d09':
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
4 years ago
Hugh.C
6ec6da1d2b
Pull request #2226 : DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
...
Merge in CORE/base-third from ~HUGH.C/base-third:DEC-17989 to release/10.0
* commit 'cf19d66e815bddcde47a97fc48be23eacfa221a0':
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
4 years ago
Hugh.C
cf19d66e81
DEC-17989 itext XXE安全漏洞修复,参考 930a1c81f8
4 years ago
superman
4f6a3ec76c
Merge pull request #2207 in CORE/base-third from feature/10.0 to feature/x
...
* commit '8dec64dba2c64323e302e253af74a8228f3d2f5c':
4 years ago
superman
8dec64dba2
Merge pull request #2205 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '79742a451dfdaa895573a649a803f9ef8747a98f':
4 years ago
superman
79742a451d
Merge pull request #2204 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '6d7f40b9edc425a2270c124a27b41ef251479d98':
4 years ago
superman
6d7f40b9ed
Merge pull request #2203 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '36178fd75876bbd4c84acb1599546ca7d7eb54f1':
4 years ago
superman
36178fd758
Merge pull request #2202 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '7bd5d8cf3ff62d770131c1a2c7a3c6cd67d7a56f':
4 years ago
superman
7bd5d8cf3f
Merge pull request #2201 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'fe8a7b02ab48ad6fbb5b04912a502b910e0da00f':
4 years ago
superman
ad8cf1e45d
Merge pull request #2188 in CORE/base-third from feature/10.0 to feature/x
...
* commit 'f001f36874bbd9bd0a621f2829ef1d7dad6b001e':
4 years ago
superman
f001f36874
Merge pull request #2186 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '28d63b8c088a614f985ff520cefb54e9ad02005f':
4 years ago
superman
28d63b8c08
Merge pull request #2185 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '5774658f3691bb455c646eb1a286d0cc0b17b1d9':
4 years ago
superman
5774658f36
Merge pull request #2184 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit 'fe8a7b02ab48ad6fbb5b04912a502b910e0da00f':
4 years ago