 zed
|
75e4955233
|
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
6 years ago |
 richie
|
1b676661ce
|
SocketIOServer.java edited online with Bitbucket
|
6 years ago |
|
richie
|
2d87ecf037
|
SocketIOServer.java edited online with Bitbucket
|
6 years ago |
|
richie
|
edb69b0208
|
KERNEL-478 升级socketio
|
6 years ago |
|
richie
|
43ff8a8d20
|
更新socketio的版本
|
6 years ago |
Kara
|
c8174ab80d
|
Merge pull request #183 in CORE/base-third from release/10.0 to final/10.0
* commit 'f47a53fe33f9875dac6576931f5da89684d38f71':
无任务，构建失败
无任务，构建失败
无任务，构建失败
|
6 years ago |
|
richie
|
e26c9b2805
|
Merge pull request #182 in CORE/base-third from ~JONAS/base-third:feature/10.0 to feature/10.0
* commit '7c8b7e562f74361336ff81e6a85aacc1fa34c21e':
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |
 JonasBollack
|
7c8b7e562f
|
上传math3资源文件
|
6 years ago |
|
JonasBollack
|
bcec716e3d
|
更改math3的gradle
|
6 years ago |
|
JonasBollack
|
8fba7e1861
|
上传commons-math3
|
6 years ago |
ju
|
f47a53fe33
|
Merge pull request #181 in CORE/base-third from ~YAOH.WU/base-third:release/10.0 to release/10.0
* commit '8d89f8aaeac260b4587ab52181536fcfaabd6203':
无任务，构建失败
|
6 years ago |
 yaoh.wu
|
8d89f8aaea
|
无任务，构建失败
|
6 years ago |
daniel
|
e130f3ee15
|
Merge pull request #180 in CORE/base-third from ~YAOH.WU/base-third:release/10.0 to release/10.0
* commit 'cd992c75939e4aca79f3ae5c4acecd79a4839aa1':
无任务，构建失败
|
6 years ago |
|
yaoh.wu
|
cd992c7593
|
无任务，构建失败
|
6 years ago |
|
daniel
|
5fd1169119
|
Merge pull request #179 in CORE/base-third from ~YAOH.WU/base-third:release/10.0 to release/10.0
* commit 'c98e64bbfdf3b5d48e25dafd78f1535e1b32a06c':
无任务，构建失败
|
6 years ago |
|
yaoh.wu
|
c98e64bbfd
|
无任务，构建失败
|
6 years ago |
|
Kara
|
506a906a61
|
Merge pull request #178 in CORE/base-third from final/10.0 to persist/10.0
* commit 'f62341c9897f5a5d0cb2e2f1ff7b08651a12b6df':
资源文件
增加j2v8
引入J2V8
资源文件
国际化时区问题，引入joda（支持JDK1.6）
REPORT-14108 预览效果不正确
无jira任务，打包报错
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
|
6 years ago |
|
Kara
|
f62341c989
|
Merge pull request #177 in CORE/base-third from release/10.0 to final/10.0
* commit '580ca893ad6bac55e811dc7b803ec4a436624bb5':
资源文件
增加j2v8
引入J2V8
资源文件
国际化时区问题，引入joda（支持JDK1.6）
REPORT-14108 预览效果不正确
无jira任务，打包报错
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
|
6 years ago |
neil
|
1f62e18657
|
Merge pull request #6 in ~NEIL/base-third from release/10.0 to feature/10.0
* commit '580ca893ad6bac55e811dc7b803ec4a436624bb5':
资源文件
增加j2v8
引入J2V8
资源文件
|
6 years ago |
|
richie
|
176dbf700b
|
资源文件
|
6 years ago |
|
richie
|
580ca893ad
|
资源文件
|
6 years ago |
|
richie
|
c13ed30fd4
|
增加j2v8
|
6 years ago |
|
richie
|
171f8e524b
|
增加J2V8
|
6 years ago |
|
richie
|
d9529ff852
|
引入J2V8
|
6 years ago |
|
richie
|
0f01b3fae9
|
资源文件
|
6 years ago |
|
richie
|
078b2c32ec
|
删除测试代码
|
6 years ago |
|
richie
|
65e52b6ab0
|
joda-time
|
6 years ago |
|
richie
|
e53ad12c6c
|
Merge remote-tracking branch 'origin/release/10.0' into feature/10.0
|
6 years ago |
|
richie
|
da1511ab8b
|
国际化时区问题，引入joda（支持JDK1.6）
|
6 years ago |
|
ju
|
3013f737ca
|
Merge pull request #174 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '645159f9a34097a34281135b698c9a5201ce83ce':
REPORT-14108 预览效果不正确
|
6 years ago |
 kerry
|
645159f9a3
|
REPORT-14108 预览效果不正确
|
6 years ago |
|
ju
|
3877da6add
|
Merge pull request #172 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '3e19c0c692220ac153798cd5194c3c2189110152':
无jira任务，打包报错
|
6 years ago |
|
kerry
|
3e19c0c692
|
无jira任务，打包报错
|
6 years ago |
|
Kara
|
e67ea81c20
|
Merge pull request #171 in CORE/base-third from ~DANIEL/base-third:persist/10.0 to persist/10.0
* commit 'ac2e571a57d2ec1274331dbfc3ee7db3ebdaae8a':
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
|
6 years ago |
|
daniel
|
ac2e571a57
|
build.third_step0.gradle edited online with Bitbucket
|
6 years ago |
|
daniel
|
6976a5bf84
|
build.third_step0.gradle edited online with Bitbucket
|
6 years ago |
|
neil
|
67fffadfb8
|
Merge pull request #169 in CORE/base-third from ~NEIL/base-third:feature/10.0 to feature/10.0
* commit 'abc665e96711e0462e07c46b90ff949ea62042d1':
分支信息
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
fenzhi
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件，报错
无JIRA任务，third打包分支错误.
|
6 years ago |
 neil
|
abc665e967
|
分支信息
|
6 years ago |
|
neil
|
18bcc44a15
|
Merge pull request #5 in ~NEIL/base-third from release/10.0 to feature/10.0
* commit '890944ddc4dcf048f2921ced3c63a94c0ff7dca8':
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
fenzhi
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件，报错
无JIRA任务，third打包分支错误.
|
6 years ago |
|
ju
|
890944ddc4
|
Merge pull request #167 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '8e724a05b87b667f143c2c37147f0daef190a3ca':
REPORT-13856 单元格设置行间距导出word不生效
|
6 years ago |
|
kerry
|
8e724a05b8
|
REPORT-13856 单元格设置行间距导出word不生效
|
6 years ago |
|
Kara
|
1e1c89d71f
|
Merge pull request #165 in CORE/base-third from ~JU/base-third:10.0 to 10.0
* commit 'f8f71d68057ca1580ba540c9b5d6bf8faf85b834': (28 commits)
升级apache工具类
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
build.third_step0.gradle edited online with Bitbucket
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
fenzhi
REPORT-13005 sub标签设置color属性，实际导出没有效果
REPORT-11969 注册增强 1. 修改 el 后缀， 通用 win/linux
REPORT-11969 注册增强
删除无用代码
删除无用代码
REPORT-11624 Excel和Word导出的html解析(third部分)
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
fix
fix
...
|
6 years ago |
|
ju
|
f8f71d6805
|
Merge branch 'final/10.0' of ssh://cloud.finedevelop.com:7999/~ju/base-third into 10.0
|
6 years ago |
|
richie
|
32005b8002
|
更新apache工具类
|
6 years ago |
|
richie
|
3fd424b07f
|
升级apache工具类
|
6 years ago |
|
richie
|
5b7bb18bfb
|
升级apache工具类
|
6 years ago |
|
richie
|
829dab5c69
|
升级apache工具类
|
6 years ago |
|
Kara
|
3dde8ae969
|
Merge pull request #163 in CORE/base-third from release/10.0 to final/10.0
* commit 'c3827b1fd1b5a468ebd841c62ed905fa4f8e1612':
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
|
6 years ago |
 zhouping
|
c3827b1fd1
|
Merge pull request #162 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'a2752fb2e28faf9b562a07d78180bab9a42a9196':
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
|
6 years ago |
zhouping
|
a2752fb2e2
|
rt
|
6 years ago |
