Commit Graph

  • a8e56e2d60 Merge pull request #1 in ~ABBY/base-third from final/10.0 to persist/10.0 Abby 2020-01-14 17:04:52 +0800
  • 20beb772a3 Merge pull request #360 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-09 17:24:53 +0800
  • 2ee2cca6aa KERNEL-1298 打包 zhouping 2020-01-09 17:23:49 +0800
  • 5240ce9f27 Merge pull request #359 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0 ju.ju 2020-01-09 13:36:30 +0800
  • 2fb9bbc5b1 REPORT-25774 使用和报表一样的方法进行计算字符宽度 Hugh.C 2020-01-09 12:35:12 +0800
  • 1085caf1b6 Merge pull request #358 in CORE/base-third from ~ABBY/base-third:final/10.0 to final/10.0 Kara 2020-01-08 23:29:54 +0800
  • 2071f4a377 Merge pull request #1 in ~ABBY/base-third from release/10.0 to final/10.0 Abby 2020-01-08 23:01:32 +0800
  • 9ca93fb581 Merge pull request #357 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-08 20:49:59 +0800
  • 7e8be86244 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-08 20:43:18 +0800
  • e646f1f7bb KERNEL-1298 调试 zhouping 2020-01-08 20:43:11 +0800
  • dfab37bd56 Merge pull request #356 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-08 20:16:25 +0800
  • 07741ca39a Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-08 20:15:36 +0800
  • 6309f096e8 KERNEL-1298 调试 zhouping 2020-01-08 20:15:29 +0800
  • 1e870d91f6 Merge pull request #354 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-08 16:44:41 +0800
  • 19bfd28eee KERNEL-1298 调试 zhouping 2020-01-08 16:41:49 +0800
  • 7566e9410d Merge pull request #353 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-07 11:59:06 +0800
  • a06c23df11 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-07 11:58:15 +0800
  • 01da6565e1 KERNEL-1298 FineThird支持JDK11 zhouping 2020-01-07 11:58:08 +0800
  • f17e13c384 Merge pull request #351 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0 ju.ju 2020-01-03 16:32:37 +0800
  • 0b1aa48608 Merge pull request #352 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-03 15:06:09 +0800
  • 0facb11f15 KERNEL-1298 FineThird支持JDK11 zhouping 2020-01-03 15:02:11 +0800
  • 52c2f5a1e5 REPORT-25774 提升权限,供外部调用 Hugh.C 2020-01-03 13:48:21 +0800
  • 29779771b2 Merge pull request #349 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-03 11:24:17 +0800
  • f992484353 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-03 11:13:22 +0800
  • 4da46de607 KERNEL-1298 build failed zhouping 2020-01-03 11:13:15 +0800
  • 2215f15cf9 Merge pull request #348 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-03 10:50:46 +0800
  • 2f42634d43 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-03 10:49:25 +0800
  • 9a570dded3 KERNEL-1298 FineThird支持JDK11 zhouping 2020-01-03 10:48:53 +0800
  • 3afaa37e34 Merge pull request #347 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-02 17:05:28 +0800
  • 5b79897c2f KERNEL-1298 FineThird支持JDK11 zhouping 2020-01-02 17:04:23 +0800
  • d12971a56a Merge pull request #346 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-02 15:56:34 +0800
  • 7e23890fd8 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-02 15:55:32 +0800
  • ff529f14a8 KERNEL-1298 编译问题 zhouping 2020-01-02 15:54:38 +0800
  • 4234b2f32b Merge pull request #345 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-02 10:43:53 +0800
  • 603de14e17 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-02 10:43:20 +0800
  • c37b36a838 KERNEL-1298 脚本修改 zhouping 2020-01-02 10:43:14 +0800
  • e49012881d Merge pull request #344 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-02 10:31:12 +0800
  • 10fd31cadc Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-02 10:29:36 +0800
  • 2078773e32 KERNEL-1298 FineThird支持JDK11 zhouping 2020-01-02 10:28:43 +0800
  • 92580c44e8 Merge pull request #343 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-01 23:12:44 +0800
  • da9763cb22 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-01 23:11:40 +0800
  • 6d46979e92 KERNEL-1298 脚本修改 zhouping 2020-01-01 23:11:31 +0800
  • d419fa65dc Merge pull request #342 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-01 22:49:38 +0800
  • 7cb3009536 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-01 22:43:24 +0800
  • 4644271b08 KERNEL-1298 脚本修改 zhouping 2020-01-01 22:43:16 +0800
  • 8f88633d05 Merge pull request #341 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-01 22:34:20 +0800
  • 67ca90a94a rt zhouping 2020-01-01 22:32:43 +0800
  • 84bfc4928e Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-01 22:30:49 +0800
  • d9c3f8c035 KERNEL-1298 打包,拆分spring与hibernate打包 zhouping 2020-01-01 22:30:18 +0800
  • 8517590696 Merge pull request #340 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-01 14:12:50 +0800
  • 48816f850a Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-01 14:10:40 +0800
  • 58bc62dfff KERNEL-1298 打包 zhouping 2020-01-01 14:10:30 +0800
  • 4bcbe6be98 Merge pull request #339 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2020-01-01 13:49:12 +0800
  • 5c40ed9cbc Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2020-01-01 13:02:48 +0800
  • 17ff6b67f3 KERNEL-1298 打包jdk7 zhouping 2020-01-01 13:02:37 +0800
  • 8b4e323e7a Merge pull request #338 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-31 15:27:47 +0800
  • b0c6ff0e4c Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-31 15:24:56 +0800
  • 9ff81c1a7a KERNEL-1298 脚本修改 zhouping 2019-12-31 15:24:48 +0800
  • 75c5612046 Merge pull request #337 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-31 15:05:48 +0800
  • ebd2abd6ac Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-31 15:04:20 +0800
  • cf4c201e97 KERNEL-1298 脚本修改 zhouping 2019-12-31 15:04:05 +0800
  • a6c5de808f Merge pull request #336 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-31 14:37:45 +0800
  • bd4c1d3f40 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-31 14:36:31 +0800
  • 5605ee0d3f KERNEL-1298 FineThird支持JDK11,适配openjdk,移包,改脚本 zhouping 2019-12-31 14:36:21 +0800
  • aeb0e2744f Merge pull request #335 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-30 18:02:28 +0800
  • 7ddbaefd70 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-30 17:59:45 +0800
  • c1e75fb609 KERNEL-1335 fine-third支持JDK11,打包 zhouping 2019-12-30 17:59:38 +0800
  • f1b34415b6 Merge pull request #334 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-30 13:39:26 +0800
  • 4612b3cc13 rt zhouping 2019-12-30 12:04:02 +0800
  • 06e5429f08 KERNEL-1335 fine-third支持JDK11,打包 zhouping 2019-12-29 23:08:25 +0800
  • 63be9054b6 Merge pull request #333 in CORE/base-third from bugfix/10.0 to release/10.0 Harrison 2019-12-27 13:57:15 +0800
  • a8db816445 Merge pull request #332 in CORE/base-third from final/10.0 to bugfix/10.0 Harrison 2019-12-27 09:32:23 +0800
  • 52bff94165 Merge pull request #331 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-26 19:36:26 +0800
  • cd3f500e53 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-26 17:04:52 +0800
  • 9f38258fa4 KERNEL-1335 fine-third支持JDK11,打包 zhouping 2019-12-26 17:04:43 +0800
  • f4ed3079c3 Merge pull request #330 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-26 12:55:09 +0800
  • ccd68e8486 KERNEL-2034 调整一下说明文件 zhouping 2019-12-25 20:08:40 +0800
  • 9bbd44eccd Merge pull request #329 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-25 19:56:22 +0800
  • 1783f8b7bb KERNEL-2034 新增httpclient库、imageJ库、dom4j库、老的poi库、、sjsxp+stax库以及降低cdi库的版本、提升jna版本 zhouping 2019-12-25 19:02:14 +0800
  • eb751634bf Merge pull request #327 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0 ju.ju 2019-12-25 09:27:10 +0800
  • 1d7bd698a6 Merge pull request #328 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0 ju.ju 2019-12-25 09:26:57 +0800
  • e847825b7a REPORT-25504 <table> 标签中的内容不按照列宽进行换行,行高逻辑错误 Hugh.C 2019-12-24 09:48:44 +0800
  • 1f6e85f39d Merge branch 'bugfix/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into bugfix/10.0 Hugh.C 2019-12-24 09:28:21 +0800
  • 6fff6aaeaf REPORT-25477 HTML解析color 错误(16进制有一些写错了) Hugh.C 2019-12-24 09:28:08 +0800
  • fcbecec6e3 Merge pull request #326 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-20 10:16:15 +0800
  • 796a64058d Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-19 20:23:08 +0800
  • 0e8623264b KERNEL-2034 fine-third依赖包fine-third-base支持jdk11,代码化 zhouping 2019-12-19 20:22:43 +0800
  • 31651af9e0 Merge pull request #325 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-19 14:54:25 +0800
  • 883b0bf657 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-19 14:43:34 +0800
  • 777165ac3e KERNEL-1328 fine-poi支持JDK11以及其他的编译问题一并修改了 zhouping 2019-12-19 14:43:28 +0800
  • 6e286e1cd0 Merge pull request #324 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-19 14:23:56 +0800
  • 0b11246e99 Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-19 11:50:02 +0800
  • 3f7a168464 KERNEL-2034 fine-third-jdk11内的代码移包,其他新增的代码也统一移包到main/java下 zhouping 2019-12-19 11:49:50 +0800
  • 91ae226702 Merge pull request #323 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-19 09:15:00 +0800
  • 2dd9113d0c Merge branch 'research/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into research/10.0 zhouping 2019-12-18 17:19:49 +0800
  • 743ee17865 KERNEL-2034 引入javax库、javamail、slf4j-api的源码,从原来的jdk11挪包到default zhouping 2019-12-18 17:19:40 +0800
  • eb61e0a7f7 Merge pull request #322 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0 zhouping 2019-12-18 17:14:44 +0800
  • 8b68aaca77 rt zhouping 2019-12-18 17:00:10 +0800
  • 00e4f75104 KERNEL-2034 引入commons-logging、commons-pool与javassist的源码 zhouping 2019-12-18 16:45:56 +0800
  • 7869153cf7 Merge pull request #321 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0 ju.ju 2019-12-17 14:39:28 +0800