 chenlw
|
fead9d9371
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
src/com/base/BaseController.java
src/com/platform/controller/DataModelController.java
src/com/platform/service/impl/MoveDataServiceImpl.java
src/com/platform/service/impl/OracleExtractServiceImpl.java
src/com/platform/utils/Constant.java
|
2016-09-20 20:45:20 +08:00 |
 wu ming
|
57a2cd17af
|
修改oracle连接策略
|
2016-09-20 11:31:02 +08:00 |
|
wu ming
|
5ba88b2d41
|
解决冲突----
|
2016-09-19 13:58:58 +08:00 |
|
wu ming
|
e317bfbacc
|
nothing
|
2016-09-19 13:30:27 +08:00 |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
2016-09-18 15:42:28 +08:00 |
|
wu ming
|
d2f5305d2b
|
合并-9.14
|
2016-09-14 14:11:16 +08:00 |
|
wu ming
|
acd377cc4d
|
修复启动oracle，测试连接oracle失败的Bug
|
2016-09-14 13:57:22 +08:00 |
|
wu ming
|
608e658d3a
|
修复启动oracle服务，测试连接oracle的Bub
|
2016-09-14 13:56:16 +08:00 |
|
chenlw
|
ef099fd1ae
|
迁移数据
|
2016-09-14 10:36:07 +08:00 |
|
chenlw
|
cb3af77285
|
集成
|
2016-09-14 09:32:55 +08:00 |
lily
|
48ae986d5c
|
reset add md5checkout
|
2016-09-13 10:38:09 +08:00 |
|
chenlw
|
ab64ab35d2
|
集成
|
2016-09-12 19:02:03 +08:00 |
|
lily
|
d3498ac95e
|
add bricks size
|
2016-09-12 10:21:31 +08:00 |
|
chenlw
|
e2e392e319
|
数据逻辑处理，oracle抽取处理，迁移数据
|
2016-09-11 18:05:37 +08:00 |
|
chenlw
|
9aa8e675ae
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform
Conflicts:
build/classes/com/platform/controller/DataModelController.class
build/classes/com/platform/controller/DefaultController.class
build/classes/com/platform/entities/FolderNode.class
build/classes/com/platform/service/OracleExtractService.class
build/classes/com/platform/test/TestController.class
build/classes/com/platform/test/TestEncodeInfoDao.class
build/classes/com/platform/test/TestEncodeService.class
build/classes/com/platform/utils/Configs.class
build/classes/com/platform/utils/ConfigsLoader.class
src/com/platform/controller/DataModelController.java
|
2016-09-11 17:46:20 +08:00 |
|
chenlw
|
3f81d31aa1
|
集成
|
2016-09-10 12:21:02 +08:00 |
|
wu ming
|
edceebeb58
|
修改xml错误
|
2016-09-10 12:11:19 +08:00 |
|
wu ming
|
b91af86ede
|
增加查询汇总库信息数据库操作
|
2016-09-10 11:24:17 +08:00 |
|
wu ming
|
939f2a0de3
|
基础版
|
2016-09-09 16:45:40 +08:00 |
|
wu ming
|
5b7257719b
|
修改masterIP
|
2016-09-09 09:18:39 +08:00 |
|
Chariesliven
|
b32e3c6e07
|
集成李立的代码
|
2016-09-08 23:04:23 +08:00 |
|
chenlw
|
d7da61c394
|
改编码方式utf8
|
2016-09-08 11:26:14 +08:00 |
|
wu ming
|
c66ba751a7
|
汇总平台java后台V1版
|
2016-09-07 17:13:59 +08:00 |