zack
|
aea547bf7f
|
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
|
5 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
|
5 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 的问题。
|
5 years ago |
|
Harrison
|
844edf1b51
|
修改文件名 fine-hibernate
|
5 years ago |
|
Harrison
|
fac226125f
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into release/10.0
|
5 years ago |
|
Harrison
|
1b4a355019
|
REPORT-18917 嵌入式部署10.0报错404+部署后模板访问空白
解决 serviceloader 加载冲突的问题。
解决 third - hibernate 读取嵌入式 hibernate 的问题。
|
5 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升级
|
5 years ago |
白岳
|
c1f7513c72
|
KERNER-724 j2v8升级
|
5 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
|
5 years ago |
|
白岳
|
f58dcc04de
|
KERNEL-724 更新third包的里面的J2V8
使用的版本是5.1.0--SNAPSHOT版本。
|
5 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 无法清除无效数据
|
5 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启动失败
|
5 years ago |
 Lanlan
|
638f7ac4fe
|
DEC-8173 脏数据导致quartz启动失败
|
5 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启动失败
|
5 years ago |
|
Lanlan
|
978eccd5be
|
DEC-8173 脏数据导致quartz启动失败
|
5 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任务 修改包名
|
5 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 |
|
Harrison
|
164b77fc8f
|
REPORT-17684 third的byteBuddy包名修改不完整，可能是导致test失败的原因
|
6 years ago |
|
Harrison
|
0c7d55249c
|
Merge pull request #228 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit '71fb10f7656527d33677d1e4ca239f632e551692':
REPORT-17530 【CRM10.0】20190527宕机风险问题：12w条clientnode 多线程下, clientbox 无法清除无效数据
|
6 years ago |
|
Harrison
|
3032294a6a
|
Merge pull request #229 in CORE/base-third from release/10.0 to feature/10.0
* commit '237f8664698bbaaf829d0fcd38bb4c1b86629955':
无JIRA任务 修改包名 resource下面用了refactor-> rename 以为可以直接改包名 我的锅
无JIRA任务 修改包名
|
6 years ago |
|
Harrison
|
71fb10f765
|
REPORT-17530 【CRM10.0】20190527宕机风险问题：12w条clientnode
多线程下, clientbox 无法清除无效数据
|
6 years ago |
xiaoxia
|
237f866469
|
Merge pull request #227 in CORE/base-third from ~XIAOXIA/base-third:release/10.0 to release/10.0
* commit '081ae2891c0a0c980ad704525c28ee74e10f82dd':
无JIRA任务 修改包名 resource下面用了refactor-> rename 以为可以直接改包名 我的锅
|
6 years ago |
|
XiaXiang
|
081ae2891c
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~xiaoxia/base-third into release/10.0
* 'release/10.0' of https://cloud.finedevelop.com/scm/~xiaoxia/base-third:
|
6 years ago |
|
XiaXiang
|
c878b16ffc
|
无JIRA任务 修改包名 resource下面用了refactor-> rename 以为可以直接改包名 我的锅
|
6 years ago |
|
xiaoxia
|
3887c690ae
|
Merge pull request #226 in CORE/base-third from ~XIAOXIA/base-third:release/10.0 to release/10.0
* commit '0e4ff9fae6a3f6ab82793d2ae18b73da8480dc99':
无JIRA任务 修改包名
|
6 years ago |
|
XiaXiang
|
0e4ff9fae6
|
无JIRA任务 修改包名
|
6 years ago |
|
richie
|
1b651b16e9
|
readme
|
6 years ago |
|
richie
|
21dfaf147c
|
CGLIB升级
|
6 years ago |
|
richie
|
a62ef07253
|
升级Byte-Buddy到1.9.12，适配Java 11+
|
6 years ago |
|
Kara
|
dea14916e6
|
Merge pull request #221 in CORE/base-third from release/10.0 to final/10.0
* commit 'adf3bac73b48e7710f11f118654f9b7c67503b30': (34 commits)
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败，job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
.
.
无JIRA任务，build failed
ct
上传math3资源文件
更改math3的gradle
上传commons-math3
rt
无JIRA任务 加个参数
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
...
|
6 years ago |
|
richie
|
90085f6f4c
|
编译等级
|
6 years ago |
|
richie
|
12d4e7ee36
|
升级CGLIB适配Java11
|
6 years ago |
|
richie
|
4b50e3ae40
|
升级ASM到7.1，支持到Java13
|
6 years ago |
 andrew.asa
|
a8807e313a
|
Merge pull request #219 in CORE/base-third from ~ANDREW.ASA/base-third:feature/10.0 to feature/10.0
* commit '90356b0b638a030df3dd761236bd6589bb9110bf':
换个名，防止
KERNEL-550 Spring配置跟客户冲突问题, third包中META-INF/spring.schemas会跟客户的冲突, 需要修改下我们的配置.
|
6 years ago |
|
andrew.asa
|
90356b0b63
|
换个名，防止
|
6 years ago |
|
andrew.asa
|
aa5cb32b23
|
KERNEL-550 Spring配置跟客户冲突问题, third包中META-INF/spring.schemas会跟客户的冲突, 需要修改下我们的配置.
|
6 years ago |
|
ju
|
430a8ec7d1
|
Merge pull request #217 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '62344215b0ec3cf22bfd611655e7edc7e2a7f2a8':
无 jira 任务， 恢复分支信息
|
6 years ago |
|
Harrison
|
62344215b0
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
|
6 years ago |
|
Harrison
|
a9c325df95
|
无 jira 任务， 恢复分支信息
|
6 years ago |
|
Harrison
|
aedf4a8891
|
Merge pull request #214 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '7b4ac3728a20d60304e0b07aa084d84b45dc4b12':
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败，job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
.
.
无JIRA任务，build failed
ct
上传math3资源文件
更改math3的gradle
上传commons-math3
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
SocketIOServer.java edited online with Bitbucket
KERNEL-478 升级socketio
无任务，构建失败
无任务，构建失败
无任务，构建失败
资源文件
增加j2v8
引入J2V8
资源文件
|
6 years ago |
|
Harrison
|
7b4ac3728a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
# Conflicts:
# fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java
|
6 years ago |
|
Kara
|
33627bc420
|
Merge pull request #210 in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0
* commit 'ca2e8dbd7e76678d6daa7c55ca7ce29e1d585d46':
DEC-7569 定时调度模块启动异常
|
6 years ago |
|
ju
|
adf3bac73b
|
Merge pull request #209 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit 'ce64b0abf2547fd370141d68a1f7552d0b6af8a7':
DEC-7569 定时调度模块启动异常
|
6 years ago |
|
Lanlan
|
ca2e8dbd7e
|
DEC-7569 定时调度模块启动异常
|
6 years ago |
|
Lanlan
|
ce64b0abf2
|
DEC-7569 定时调度模块启动异常
|
6 years ago |
|
Kara
|
c9dafb12eb
|
Merge pull request #208 in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0
* commit 'd7bc5569409e9aef9ed1e4cbf8586b2489359363':
无JIRA任务 打包失败，job未初始化
|
6 years ago |
|
ju
|
7120a20fb4
|
Merge pull request #207 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '17e93b6201c887407a8dcb897527006798fa704f':
无JIRA任务 打包失败，job未初始化
|
6 years ago |
