Commit Graph

  • 01370efc90 DEC-5983 【10.0.2】200并发压测中,一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block,系统卡顿 升级jackson 2.7 zhouping 2018-12-20 17:21:13 +0800
  • 8129ee6a68 Merge pull request #161 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0 Harrison 2018-12-18 19:31:35 +0800
  • e025f972ab DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架 Harrison 2018-12-18 18:56:04 +0800
  • 1131451094 Merge pull request #160 in CORE/base-third from ~DANIEL/base-third:final/10.0 to final/10.0 richie 2018-12-18 15:15:37 +0800
  • 5c95abb133 build.third_step0.gradle edited online with Bitbucket daniel 2018-12-18 15:04:19 +0800
  • 43066bac0c Merge pull request #158 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0 ju 2018-12-13 16:57:24 +0800
  • d4323d8e43 REPORT-13464 [10.0.2回归]表单导出排版混乱,背景未导出 kerry 2018-12-13 16:04:32 +0800
  • 2fa1486158 Merge pull request #157 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0 neil 2018-12-05 14:43:48 +0800
  • c92ae4fa5e fenzhi neil 2018-12-05 14:38:27 +0800
  • c300ea27f0 Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/base-third into release/10.0 neil 2018-12-05 14:30:45 +0800
  • d731b2ab8d Merge pull request #4 in ~NEIL/base-third from feature/10.0 to release/10.0 neil 2018-12-05 14:23:28 +0800
  • 9f7b4b9fb5 Merge pull request #156 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 ju 2018-11-30 17:33:01 +0800
  • f64ff89c6c REPORT-13005 sub标签设置color属性,实际导出没有效果 kerry 2018-11-30 16:23:25 +0800
  • fca7debc79 Merge pull request #154 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0 Harrison 2018-11-27 14:00:21 +0800
  • 7dc60e19f9 REPORT-11969 注册增强 1. 修改 el 后缀, 通用 win/linux Harrison 2018-11-27 10:06:20 +0800
  • 33b1510083 Merge pull request #153 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0 Harrison 2018-11-26 19:43:07 +0800
  • 7d2e9d3485 REPORT-11969 注册增强 Harrison 2018-11-26 17:52:50 +0800
  • 5632460101 Merge pull request #151 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 ju 2018-11-22 14:36:44 +0800
  • 0d859e400e 删除无用代码 kerry 2018-11-22 14:19:56 +0800
  • 71e27eff53 删除无用代码 kerry 2018-11-22 14:17:46 +0800
  • 7e5de3f688 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-11-22 14:05:26 +0800
  • 9ed5213d06 REPORT-11624 Excel和Word导出的html解析(third部分) kerry 2018-11-22 14:05:17 +0800
  • 3cd1501106 Merge pull request #145 in CORE/base-third from ~JU/base-third:10.0 to 10.0 ju 2018-11-05 21:01:09 +0800
  • 389923146f Merge pull request #147 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0 ju 2018-11-05 20:59:26 +0800
  • c8626a34c5 Merge pull request #146 in CORE/base-third from ~JU/base-third:feature/10.0 to feature/10.0 ju 2018-11-05 20:59:15 +0800
  • e8a128b498 CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader ju 2018-11-05 20:56:05 +0800
  • 431024faf4 fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader ju 2018-11-05 20:55:30 +0800
  • 8e2883819b Merge branch '10.0' of http://cloud.finedevelop.com:2015/scm/~ju/base-third into 10.0 ju 2018-11-05 20:53:26 +0800
  • 9fea4fc6ee CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader ju 2018-11-05 20:53:07 +0800
  • 50f2af2f39 Merge pull request #143 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0 ju 2018-11-05 20:03:20 +0800
  • 8d77973cc3 Merge pull request #144 in CORE/base-third from ~JU/base-third:feature/10.0 to feature/10.0 ju 2018-11-05 20:03:16 +0800
  • a62e034ba5 Merge pull request #141 in CORE/base-third from ~JU/base-third:10.0 to 10.0 ju 2018-11-05 20:02:47 +0800
  • e3fc7111e3 fix ju 2018-11-05 20:01:02 +0800
  • 1bca05da28 fix ju 2018-11-05 20:00:20 +0800
  • 3cfcbfccf2 fix ju 2018-11-05 19:56:28 +0800
  • ac5af2507b Merge pull request #138 in CORE/base-third from ~ZED/fine-base-third:feature/10.0 to feature/10.0 ju 2018-11-02 10:11:14 +0800
  • e02c3535af Merge pull request #140 in CORE/base-third from ~ZED/fine-base-third:10.0 to 10.0 ju 2018-11-02 10:11:07 +0800
  • eb1dae5da6 Merge pull request #139 in CORE/base-third from ~ZED/fine-base-third:release/10.0 to release/10.0 ju 2018-11-02 10:10:53 +0800
  • 1d378a4e5c fix zed 2018-11-02 09:44:12 +0800
  • 88fad2be00 fix zed 2018-11-02 09:40:22 +0800
  • c066969f5a fix zed 2018-11-02 09:20:11 +0800
  • da0a9c47b2 MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错 zed 2018-11-01 18:37:39 +0800
  • 186c0e86ff MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错 zed 2018-11-01 18:32:51 +0800
  • 8042b90644 fix zed 2018-11-01 18:22:46 +0800
  • d78f153f0e fix zed 2018-11-01 18:21:28 +0800
  • 7861d09d54 MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错 zed 2018-11-01 17:52:16 +0800
  • ae87604278 Merge pull request #134 in CORE/base-third from ~JU/base-third:10.0 to 10.0 ju 2018-10-31 20:31:52 +0800
  • ff113b5f64 fix ju 2018-10-31 20:25:22 +0800
  • aa0f4b923f Merge pull request #132 in CORE/base-third from release/9.0 to master ju 2018-10-31 20:20:48 +0800
  • 66c61e6cea Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/core/base-third into 10.0 ju 2018-10-31 20:19:36 +0800
  • 3e77f92178 Merge pull request #131 in CORE/base-third from ~NEIL/base-third:feature/10.0 to feature/10.0 neil 2018-10-31 16:03:25 +0800
  • ed8bc53c86 无JIRA任务,third打包分支错误. neil 2018-10-31 16:02:14 +0800
  • e009c01d96 无JIRA任务,third打包分支错误. neil 2018-10-31 15:46:14 +0800
  • 0d949530a7 Merge pull request #130 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0 ju 2018-10-30 17:59:34 +0800
  • 2120b035a5 kerry 2018-10-30 16:58:28 +0800
  • 452733e0e9 Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0 kerry 2018-10-30 16:43:57 +0800
  • ea82a6fc62 REPORT-11624 Excel和Word导出的html解析支持 kerry 2018-10-30 16:43:47 +0800
  • 3461fe70dc Merge pull request #129 in CORE/base-third from release/10.0 to feature/10.0 richie 2018-10-25 11:21:02 +0800
  • 848445c995 增加启动监听 richie 2018-10-17 14:25:17 +0800
  • 7db701f4a6 Merge pull request #128 in CORE/base-third from release/10.0 to feature/10.0 neil 2018-10-16 08:50:50 +0800
  • 20d9bf36bd Merge pull request #127 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0 rinoux 2018-10-13 00:57:20 +0800
  • 668dd48e3d Merge pull request #126 in CORE/base-third from ~JU/base-third:10.0 to 10.0 rinoux 2018-10-13 00:57:07 +0800
  • c117be5e40 fix ju 2018-10-13 00:54:09 +0800
  • fdd52d35a7 fix ju 2018-10-13 00:53:08 +0800
  • 07e80d35af DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错 ju 2018-10-13 00:50:18 +0800
  • 6488db1534 Merge pull request #123 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0 ju 2018-09-30 10:29:31 +0800
  • fc4d1c7335 Merge pull request #124 in CORE/base-third from ~KERRY/base-third:10.0 to 10.0 ju 2018-09-30 10:29:24 +0800
  • acd6617ad1 无jira任务,打包失败 kerry 2018-09-30 10:28:02 +0800
  • 5b87243654 无jira任务,打包失败 kerry 2018-09-30 10:25:16 +0800
  • d43d08e30c Merge pull request #121 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0 neil 2018-09-30 08:40:18 +0800
  • a699534bb6 Merge pull request #122 in CORE/base-third from ~KERRY/base-third:10.0 to 10.0 neil 2018-09-30 08:39:59 +0800
  • 755e8aa025 代码修改 kerry 2018-09-29 16:13:56 +0800
  • 7c49b26bbc REPORT-10262 html大文本精确分页 kerry 2018-09-29 16:13:24 +0800
  • 708ccfb9c3 Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into release/10.0 kerry 2018-09-29 16:09:53 +0800
  • 6a959c0b33 REPORT-10262 html大文本精确分页 kerry 2018-09-29 16:09:44 +0800
  • 23ef3961a0 REPORT-11516 富文本在内容前添加空格导出word和预览不一致 kerry 2018-09-29 15:43:21 +0800
  • 94a4a69181 REPORT-11516 富文本在内容前添加空格导出word和预览不一致 kerry 2018-09-29 15:40:31 +0800
  • 3dbb4a730b Merge pull request #120 in CORE/base-third from release/10.0 to 10.0 ju 2018-09-26 23:45:14 +0800
  • 69e3fa6120 Merge pull request #119 in CORE/base-third from ~KERRY/base-third:release/9.0 to release/9.0 ju 2018-09-26 19:48:38 +0800
  • 8abd0d79ed 删除其他配置文件 kerry 2018-09-26 17:35:14 +0800
  • bbcb6aaf41 wu kerry 2018-09-26 17:05:14 +0800
  • 47339a46a5 SAHNC kerry 2018-09-26 17:01:40 +0800
  • f8ba55d083 WU kerry 2018-09-26 16:59:45 +0800
  • 9a7903d064 Merge pull request #118 in CORE/base-third from feature/10.0 to release/10.0 Harrison 2018-09-20 21:19:53 +0800
  • 2433f121ba Merge pull request #117 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0 loy 2018-09-19 14:09:49 +0800
  • 67a16f2f08 REPORT-11437 调整druid源码 loy 2018-09-19 12:49:38 +0800
  • 2322887305 Merge pull request #116 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0 ju 2018-09-19 11:31:04 +0800
  • d767e030af REPORT-11437 调整druid源码,支持读取hibernate配置 loy 2018-09-19 11:14:35 +0800
  • 06da03effe Merge pull request #115 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0 ju 2018-09-17 14:30:59 +0800
  • 63addb8666 RELEASE ju 2018-09-17 14:29:23 +0800
  • 42a0d917ff RELEASE ju 2018-09-17 14:29:07 +0800
  • c44af1404f RELEASE ju 2018-09-17 14:28:53 +0800
  • 9199beb2ca RELEASE ju 2018-09-17 14:28:40 +0800
  • c28fca3d93 RELEASE ju 2018-09-17 14:28:25 +0800
  • 91c223f7cc RELEASE ju 2018-09-17 14:28:08 +0800
  • 07b9b8356a RELEASE ju 2018-09-17 14:27:48 +0800
  • cd3141bbb9 Merge pull request #113 in CORE/base-third from feature/10.0 to release/10.0 ju 2018-09-17 12:20:18 +0800
  • 5fa0418bb2 Merge pull request #111 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0 loy 2018-09-17 09:04:44 +0800
  • 30a3df4444 Merge pull request #112 in CORE/base-third from feature/10.0 to release/10.0 ju 2018-09-16 22:02:38 +0800
  • e0f1d20a6e DEC-4430 添加ehcache源码中缺少的类 loy 2018-09-16 08:53:41 +0800