XiaXiang
|
deecbc85de
|
rt
|
6 years ago |
XiaXiang
|
d3913b10fa
|
无JIRA任务 加个参数
|
6 years ago |
xiaoxia
|
5857fcc09c
|
Merge pull request #188 in CORE/base-third from ~XIAOXIA/base-third:feature/10.0 to feature/10.0
* commit 'df37bc61511aaa9a086e2402db6afa05765a61e8':
lib
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
REPORT-14835 模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
XiaXiang
|
df37bc6151
|
lib
|
6 years ago |
XiaXiang
|
953f474189
|
REPORT-14835
模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
XiaXiang
|
6ed2f1ff53
|
REPORT-14835
模板版本管理优化及内置 代码逻辑调整
|
6 years ago |
ju
|
f2a3aae412
|
Merge pull request #187 in CORE/base-third from ~JINBOKAI/base-third:feature/10.0 to feature/10.0
* commit '0d95293756d79a5adbb21c318fcf89e3551f2a59':
REPORT-14820 log4j&log4j-extras resources直接拷贝
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
0d95293756
|
REPORT-14820 log4j&log4j-extras resources直接拷贝
|
6 years ago |
jinbokai
|
fa8c9cc970
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
1c03a0f3dc
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
jinbokai
|
5dd4c5d9f8
|
REPORT-14820 输出日志太大的问题 log4j&log4j-extras
|
6 years ago |
zed
|
659e11f432
|
Merge pull request #185 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0
* commit '75e495523389d8dca1430ea06de858649f5db3c7':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
zed
|
75e4955233
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
richie
|
1b676661ce
|
SocketIOServer.java edited online with Bitbucket
|
6 years ago |
richie
|
43ff8a8d20
|
更新socketio的版本
|
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 |
richie
|
176dbf700b
|
资源文件
|
6 years ago |
richie
|
171f8e524b
|
增加J2V8
|
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 |
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 |
richie
|
3fd424b07f
|
升级apache工具类
|
6 years ago |
richie
|
829dab5c69
|
升级apache工具类
|
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 |
zhouping
|
44e9332685
|
rt 误删了定制内容
|
6 years ago |
zhouping
|
01370efc90
|
DEC-5983 【10.0.2】200并发压测中,一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block,系统卡顿
升级jackson 2.7
|
6 years ago |
Harrison
|
8129ee6a68
|
Merge pull request #161 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit 'e025f972ab0fec35fcfc19598b17e79d51e95394':
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
|
6 years ago |
Harrison
|
e025f972ab
|
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败
重编译第三方框架
|
6 years ago |
ju
|
43066bac0c
|
Merge pull request #158 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit 'd4323d8e43b550f9c3625876341785528bbe38a3':
REPORT-13464 [10.0.2回归]表单导出排版混乱,背景未导出
|
6 years ago |
kerry
|
d4323d8e43
|
REPORT-13464 [10.0.2回归]表单导出排版混乱,背景未导出
|
6 years ago |
neil
|
2fa1486158
|
Merge pull request #157 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit 'c92ae4fa5eefb10831ef5564662647ba4a0c43fb':
fenzhi
REPORT-13005 sub标签设置color属性,实际导出没有效果
REPORT-11969 注册增强 1. 修改 el 后缀, 通用 win/linux
REPORT-11969 注册增强
删除无用代码
删除无用代码
REPORT-11624 Excel和Word导出的html解析(third部分)
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
无JIRA任务,third打包分支错误.
无JIRA任务,third打包分支错误.
无
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
neil
|
c92ae4fa5e
|
fenzhi
|
6 years ago |
neil
|
c300ea27f0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/base-third into release/10.0
|
6 years ago |
neil
|
d731b2ab8d
|
Merge pull request #4 in ~NEIL/base-third from feature/10.0 to release/10.0
* commit '9f7b4b9fb5f5aced05af953a45f74a8cdd1e871e':
REPORT-13005 sub标签设置color属性,实际导出没有效果
REPORT-11969 注册增强 1. 修改 el 后缀, 通用 win/linux
REPORT-11969 注册增强
删除无用代码
删除无用代码
REPORT-11624 Excel和Word导出的html解析(third部分)
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
无JIRA任务,third打包分支错误.
无
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
ju
|
9f7b4b9fb5
|
Merge pull request #156 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit 'f64ff89c6c4468c0564d8aa92dbee148ae1d49a5':
REPORT-13005 sub标签设置color属性,实际导出没有效果
|
6 years ago |
kerry
|
f64ff89c6c
|
REPORT-13005 sub标签设置color属性,实际导出没有效果
|
6 years ago |