Harrison
|
08005033f0
|
Merge pull request #259 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit '6bd102f94b9e8013471592585e96ed52da868395':
REPORT-19507 滚动消息插件,效果不正常,包名修改
|
5 years ago |
Bryant
|
6bd102f94b
|
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
|
5 years ago |
Bryant
|
d1f961d83c
|
REPORT-19507
滚动消息插件,效果不正常,包名修改
|
5 years ago |
ju.ju
|
b0459405ac
|
Merge pull request #257 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit '83d1735224f3ebc30dd6b4124064590c032389ce':
REPORT-19507 滚动消息插件,效果不正常,包名修改
|
5 years ago |
Bryant
|
83d1735224
|
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
|
5 years ago |
Bryant
|
dfe24c5504
|
REPORT-19507
滚动消息插件,效果不正常,包名修改
|
5 years ago |
ju.ju
|
5e02c3df0a
|
Merge pull request #256 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit 'dd780c0f76e8aded48ebfecc7d60bfde497eab46':
REPORT-19507 滚动消息插件,效果不正常
|
5 years ago |
Bryant
|
dd780c0f76
|
REPORT-19507
滚动消息插件,效果不正常
|
5 years ago |
ju.ju
|
bde9b882bf
|
Merge pull request #255 in CORE/base-third from ~JU/base-third:bugfix/10.0 to bugfix/10.0
* commit 'f45884dac4ec223e73bafc44888ab523fc5cf4ae':
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
|
5 years ago |
ju
|
f45884dac4
|
fix
|
5 years ago |
ju
|
31d6643c18
|
fix
|
5 years ago |
ju
|
359f674591
|
fix
|
5 years ago |
ju
|
19e62feefb
|
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
|
5 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
|
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 |
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 |
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 |
richie
|
6dcadd7fb9
|
JB注解
|
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
|
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 |
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
|
ce64b0abf2
|
DEC-7569 定时调度模块启动异常
|
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 |
Lanlan
|
17e93b6201
|
无JIRA任务 打包失败,job未初始化
|
6 years ago |
neil
|
4e366f8a97
|
Merge pull request #204 in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '888fd8ee0b7fbe4d23de17f8ae890e5554ed01a0':
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
Lanlan
|
888fd8ee0b
|
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
|
6 years ago |
neil
|
4de2e10c18
|
Merge pull request #200 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit '1232e835836de87ad63308cd8cb20749001e831a':
.
.
无JIRA任务,build failed
|
6 years ago |
neil
|
1232e83583
|
.
|
6 years ago |
neil
|
e0240c694c
|
.
|
6 years ago |
neil
|
2ca92358a7
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/base-third into release/10.0
|
6 years ago |
neil
|
d5e8b0d37f
|
无JIRA任务,build failed
|
6 years ago |
neil
|
0c78d7ac3f
|
Merge pull request #199 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit 'de9e71b6ba2e9b08d3c97be7bb4607444afe87fe': (22 commits)
ct
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
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
资源文件
增加J2V8
删除测试代码
joda-time
...
|
6 years ago |
neil
|
de9e71b6ba
|
Merge pull request #7 in ~NEIL/base-third from feature/10.0 to release/10.0
* commit 'f514a1d653993441e26c3a82d26bdd718f4b6e79': (22 commits)
ct
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
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
资源文件
增加J2V8
删除测试代码
joda-time
...
|
6 years ago |
neil
|
f514a1d653
|
ct
|
6 years ago |
neil
|
55498c4530
|
Merging in latest from upstream (CORE/base-third:refs/heads/feature/10.0)
* commit 'a6359e2e14a9cfb801c1342855584b1e1e2ba15b':
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
SocketIOServer.java edited online with Bitbucket
更新socketio的版本
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |