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 |
 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
|
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 |
|
neil
|
2788e4d282
|
Merge pull request #203 in CORE/base-third from ~LANLAN/base-third:feature/10.0 to feature/10.0
* commit 'f03371b0d254b2b467e9d263b348527cf8b88bc3':
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
6 years ago |
|
Lanlan
|
f03371b0d2
|
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 |
|
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 |
|
Kara
|
e397250856
|
Merge pull request #198 in CORE/base-third from ~ZED/base-third:final/10.0 to final/10.0
* commit 'a4f8a6ac14b7bcfe514fbd5c8a6c23e6e817e873':
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
6 years ago |
 zed
|
a4f8a6ac14
|
DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
|
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 |
|
richie
|
a3ae3092f5
|
Merge pull request #190 in CORE/base-third from ~JONAS/base-third:release/10.0 to release/10.0
* commit 'dce636e145609b8bac1a533cefbab6ab5c681dbd':
上传math3资源文件
更改math3的gradle
上传commons-math3
|
6 years ago |
|
Kara
|
fd8f510cf1
|
Merge pull request #197 in CORE/base-third from final/10.0 to persist/10.0
* commit '155c37de8a25ede4bc900799162e03004f92a2d3':
无 jira 任务， final --> persist 回复一下
|
6 years ago |
|
Kara
|
155c37de8a
|
Merge pull request #196 in CORE/base-third from ~HARRISON/base-third:final/10.0 to final/10.0
* commit '0a507d8f78dd566c838ec7b847f0b8532ac246ea':
无 jira 任务， final --> persist 回复一下
|
6 years ago |
