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 |
|
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启动失败
|
5 years ago |
ju
|
e2a14908d0
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~ju/base-third into final/10.0
|
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配置
|
5 years ago |
zack
|
b7f2ae02db
|
REPORT-18472 spring集成10.0报错 我们的ContextLoader扫到了客户的web.xml里面的spring配置
|
5 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版本。
|
5 years ago |
白岳
|
cd86234982
|
KERNEL-554 J2V8的Linux-arm版本。
|
5 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重新拉了一份源码覆盖掉了，重新提交下
|
5 years ago |
|
zack
|
aea547bf7f
|
REPORT-18993 log4j冲突问题处理，这个在9.0是处理过的，后来jinbokai重新拉了一份源码覆盖掉了，重新提交下
|
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
|
18f7a6f788
|
Merge pull request #238 in CORE/base-third from final/10.0 to persist/10.0
* commit '56288c9dd09daa903c8bf5da7e7fce0a60faa417':
KERNER-724 j2v8升级
|
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 |
|
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 |
|
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 |
|
Kara
|
8a90836f6e
|
Merge pull request #222 in CORE/base-third from final/10.0 to persist/10.0
* commit 'dea14916e66742a4bb5269fa81032570bc86c329': (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 |
|
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 |
|
Kara
|
003c2b39a8
|
Merge pull request #211 in CORE/base-third from final/10.0 to persist/10.0
* commit '33627bc420cb8a29515ee4e18be42b2f6d2cdc85':
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败，job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
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 |
|
Lanlan
|
d7bc556940
|
无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 |
|
Kara
|
715e8099ea
|
Merge pull request #205 in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0
* commit '0c0cec7b54b4398b09f9efd8c360a1051e1293fe':
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
6 years ago |
|
Lanlan
|
0c0cec7b54
|
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 |
