ju
|
31d6643c18
|
fix
|
5 years ago |
|
ju
|
359f674591
|
fix
|
5 years ago |
|
ju
|
19e62feefb
|
无JIRA任务 开一个default包，用于针对性的修改原来在3rd.jar中的class（有些太老了完整反编译老出错，也不知道定制了啥，就针对性的修改一个class）
|
5 years ago |
 andrew.asa
|
a38d1d6dd1
|
Merge pull request #254 in CORE/base-third from ~ANDREW.ASA/base-third:feature/10.0 to feature/10.0
* commit '145bd139ed1f06c6b41838765df383e9d0f9a273':
KERNEL-753 增加对LDAP的支持，将Spring的LDAP模块编译到third中
|
5 years ago |
|
andrew.asa
|
145bd139ed
|
KERNEL-753 增加对LDAP的支持，将Spring的LDAP模块编译到third中
|
5 years ago |
Kara
|
70c5d25bd1
|
Merge pull request #253 in CORE/base-third from ~ZED/base-third:final/10.0 to final/10.0
* commit 'f21316e79488ee1c17fe59dad1d0ce76ba651746':
DEC-8889 jackson高危漏洞
|
5 years ago |
 zed
|
f4f4f517e9
|
Merge pull request #251 in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '1e321d06edb66a6ccbb631a2d31de92ef6e40ec8':
DEC-8889 jackson高危漏洞
|
5 years ago |
|
zed
|
7eae55638b
|
Merge pull request #252 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0
* commit '812651a0e2c36083cfc24fea170209b70fc9a569':
DEC-8889 jackson高危漏洞
|
5 years ago |
|
zed
|
f21316e794
|
DEC-8889 jackson高危漏洞
|
5 years ago |
|
zed
|
812651a0e2
|
DEC-8889 jackson高危漏洞
|
5 years ago |
|
zed
|
1e321d06ed
|
DEC-8889 jackson高危漏洞
|
5 years ago |
|
ju.ju
|
c7274f5e17
|
Merge pull request #250 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit 'adcadc201449a18030736ad82f85502690b8d13a':
更改 feature 源码编译等级为 1.7
|
5 years ago |
 Harrison
|
adcadc2014
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
|
5 years ago |
|
Harrison
|
c5ec2c811c
|
更改 feature 源码编译等级为 1.7
|
5 years ago |
|
Harrison
|
da0aa45922
|
Merge pull request #249 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '10212cc4e729fefe99911975d8f45bc50d9bce6f':
将 antlr4 放入 third 中。
|
5 years ago |
|
Harrison
|
10212cc4e7
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
|
5 years ago |
|
Harrison
|
1740f63dc8
|
将 antlr4 放入 third 中。
|
5 years ago |
|
Harrison
|
a1474c96b7
|
Merge pull request #248 in CORE/base-third from release/10.0 to feature/10.0
* commit '9f4df6e08f6959ff67141ed4e40686072888a9bc':
RoaringBitmap单独抽到third
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
KERNEL-554 J2V8的Linux-arm版本。
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
|
5 years ago |
|
Kara
|
f6dfc0bb10
|
Merge pull request #247 in CORE/base-third from final/10.0 to persist/10.0
* commit '7aa138afd88ff7dfe72961566dcf8ad420ee9051':
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
KERNEL-554 J2V8的Linux-arm版本。
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
修改文件名 fine-hibernate
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白 解决 serviceloader 加载冲突的问题。 解决 third - hibernate 读取嵌入式 hibernate 的问题。
KERNEL-724 更新third包的里面的J2V8
DEC-8173 脏数据导致quartz启动失败
|
5 years ago |
|
ju.ju
|
9f4df6e08f
|
Merge pull request #246 in CORE/base-third from ~ALEX.SUNG/base-third:release/10.0 to release/10.0
* commit '6e9a25bffc7b9132a49616dbdb9d0b3945932dd8':
RoaringBitmap单独抽到third
|
5 years ago |
 alex.sung
|
6e9a25bffc
|
RoaringBitmap单独抽到third
|
5 years ago |
|
Kara
|
7aa138afd8
|
Merge pull request #245 in CORE/base-third from ~JU/base-third:final/10.0 to final/10.0
* commit 'e2a14908d0a78e4335729ae9efed60440b08fb43':
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
KERNEL-554 J2V8的Linux-arm版本。
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
修改文件名 fine-hibernate
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白 解决 serviceloader 加载冲突的问题。 解决 third - hibernate 读取嵌入式 hibernate 的问题。
KERNEL-724 更新third包的里面的J2V8
DEC-8173 脏数据导致quartz启动失败
|
6 years ago |
|
ju
|
e2a14908d0
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~ju/base-third into final/10.0
|
6 years ago |
 richie
|
ede27ae553
|
Merge pull request #243 in CORE/base-third from ~ZACK/base-third:release/10.0 to release/10.0
* commit 'b7f2ae02db5f6103d50e86f07d21abd78168c2c6':
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
|
6 years ago |
zack
|
b7f2ae02db
|
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
|
6 years ago |
eason
|
84b760a11a
|
Merge pull request #242 in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit 'cd862349825fc92a1371062f2ecc5aab2d3be3d3':
KERNEL-554 J2V8的Linux-arm版本。
|
6 years ago |
白岳
|
cd86234982
|
KERNEL-554 J2V8的Linux-arm版本。
|
6 years ago |
|
richie
|
932ad142dc
|
Merge pull request #241 in CORE/base-third from ~ZACK/base-third:release/10.0 to release/10.0
* commit 'aea547bf7ffafd53ac156e9dd2b47488b3691e5a':
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
|
6 years ago |
|
zack
|
aea547bf7f
|
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
|
6 years ago |
|
Harrison
|
a09c3a3769
|
Merge pull request #240 in CORE/base-third from release/10.0 to feature/10.0
* commit 'c5991d2cd73f910c4f61e2d45876db5144d9a5c4':
修改文件名 fine-hibernate
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白 解决 serviceloader 加载冲突的问题。 解决 third - hibernate 读取嵌入式 hibernate 的问题。
KERNEL-724 更新third包的里面的J2V8
|
6 years ago |
|
Harrison
|
c5991d2cd7
|
Merge pull request #239 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit '844edf1b51f0da65256869755630a2cb98a508e1':
修改文件名 fine-hibernate
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白 解决 serviceloader 加载冲突的问题。 解决 third - hibernate 读取嵌入式 hibernate 的问题。
|
6 years ago |
|
Harrison
|
844edf1b51
|
修改文件名 fine-hibernate
|
6 years ago |
|
Harrison
|
fac226125f
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into release/10.0
|
6 years ago |
|
Harrison
|
1b4a355019
|
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白
解决 serviceloader 加载冲突的问题。
解决 third - hibernate 读取嵌入式 hibernate 的问题。
|
6 years ago |
|
Kara
|
18f7a6f788
|
Merge pull request #238 in CORE/base-third from final/10.0 to persist/10.0
* commit '56288c9dd09daa903c8bf5da7e7fce0a60faa417':
KERNER-724 j2v8升级
|
6 years ago |
|
Kara
|
56288c9dd0
|
Merge pull request #237 in CORE/base-third from ~BJORN/base-third:final/10.0 to final/10.0
* commit 'c1f7513c7244a6668f735b0842bcc419cb26afec':
KERNER-724 j2v8升级
|
6 years ago |
|
白岳
|
c1f7513c72
|
KERNER-724 j2v8升级
|
6 years ago |
|
eason
|
b302f86d4e
|
Merge pull request #236 in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit 'f58dcc04decb89a105e94360edd8c7563dac4d8c':
KERNEL-724 更新third包的里面的J2V8
|
6 years ago |
|
白岳
|
f58dcc04de
|
KERNEL-724 更新third包的里面的J2V8
使用的版本是5.1.0--SNAPSHOT版本。
|
6 years ago |
|
Harrison
|
1a2b319c24
|
Merge pull request #235 in CORE/base-third from release/10.0 to feature/10.0
* commit 'aa96c0380e1e574b176e93fcddc33b96cf71b761':
DEC-8173 脏数据导致quartz启动失败
JB注解
REPORT-17530 【CRM10.0】20190527宕机风险问题：12w条clientnode 多线程下, clientbox 无法清除无效数据
|
6 years ago |
|
Kara
|
3df5fa0186
|
Merge pull request #234 in CORE/base-third from final/10.0 to persist/10.0
* commit '42188baa417ce930f2fe3de661aebb970b0021b0':
DEC-8173 脏数据导致quartz启动失败
JB注解
REPORT-17530 【CRM10.0】20190527宕机风险问题：12w条clientnode 多线程下, clientbox 无法清除无效数据
无JIRA任务 修改包名 resource下面用了refactor-> rename 以为可以直接改包名 我的锅
无JIRA任务 修改包名
|
6 years ago |
|
Kara
|
42188baa41
|
Merge pull request #233 in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0
* commit '638f7ac4fea70acfaae47f05b35b0e50a9cf45ef':
DEC-8173 脏数据导致quartz启动失败
|
6 years ago |
 Lanlan
|
638f7ac4fe
|
DEC-8173 脏数据导致quartz启动失败
|
6 years ago |
|
ju
|
aa96c0380e
|
Merge pull request #232 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '978eccd5be67e6579db47fddeddba7f94094cf02':
DEC-8173 脏数据导致quartz启动失败
|
6 years ago |
|
Lanlan
|
978eccd5be
|
DEC-8173 脏数据导致quartz启动失败
|
6 years ago |
|
Kara
|
6263ea8265
|
Merge pull request #231 in CORE/base-third from release/10.0 to final/10.0
* commit '6dcadd7fb9b357aab135c4c6bc570730135958c5':
JB注解
REPORT-17530 【CRM10.0】20190527宕机风险问题：12w条clientnode 多线程下, clientbox 无法清除无效数据
无JIRA任务 修改包名 resource下面用了refactor-> rename 以为可以直接改包名 我的锅
无JIRA任务 修改包名
|
6 years ago |
|
richie
|
6dcadd7fb9
|
JB注解
|
6 years ago |
|
richie
|
795e1fd29b
|
把JB的注解加进来，IDEA开始时能正确的识别
|
6 years ago |
|
Harrison
|
49a22ec188
|
Merge pull request #230 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '838954e6e1a47bc4f780663130a2eb376acc09dc':
继续修改
REPORT-17684 third的byteBuddy包名修改不完整，可能是导致test失败的原因
|
6 years ago |
|
Harrison
|
838954e6e1
|
继续修改
|
6 years ago |
