 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 |
|
chenlw
|
4d8078c6c1
|
调试修改代码-联调
|
2016-09-20 20:32:46 +08:00 |
 wu ming
|
faadafadfd
|
--完善功能
|
2016-09-20 18:52:13 +08:00 |
|
wu ming
|
e42e9b9554
|
update .gitignore
|
2016-09-20 15:03:30 +08:00 |
|
wu ming
|
a82a9b0397
|
update .gitignore
|
2016-09-20 15:03:20 +08:00 |
|
wu ming
|
0412d82278
|
合并--9.20
|
2016-09-20 14:50:08 +08:00 |
|
wu ming
|
83170155be
|
--合并
|
2016-09-20 14:47:54 +08:00 |
|
chenlw
|
b56e1a8deb
|
恢复test
|
2016-09-20 14:46:38 +08:00 |
|
chenlw
|
a1310b127d
|
会略
|
2016-09-20 14:19:04 +08:00 |
|
chenlw
|
172b1b512b
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform
Conflicts:
src/com/platform/controller/DataModelController.java
|
2016-09-20 14:14:11 +08:00 |
|
wu ming
|
d35115800d
|
update .gitignore
|
2016-09-20 14:13:39 +08:00 |
|
wu ming
|
e1e273fb1c
|
update .gitignore
|
2016-09-20 14:12:08 +08:00 |
|
chenlw
|
19e9b502ec
|
接收请求方式修改
|
2016-09-20 14:01:52 +08:00 |
|
chenlw
|
b252d63312
|
联调之前测试后修改请求接收方式
|
2016-09-20 13:54:51 +08:00 |
|
wu ming
|
57a2cd17af
|
修改oracle连接策略
|
2016-09-20 11:31:02 +08:00 |
|
wu ming
|
d4db086706
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
|
2016-09-20 09:10:15 +08:00 |
|
wu ming
|
d3e79bd886
|
合并----
|
2016-09-20 09:09:56 +08:00 |
|
chenlw
|
09064c9d9e
|
多字段模糊查询数据，
|
2016-09-19 18:49:33 +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
|
f4d9113d4c
|
修改字段
|
2016-09-18 18:53:21 +08:00 |
|
chenlw
|
51c06b3a8a
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform
Conflicts:
src/com/platform/glusterfs/CopyData.java
src/com/platform/utils/Constant.java
|
2016-09-18 15:56:46 +08:00 |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
2016-09-18 15:42:28 +08:00 |
|
chenlw
|
d99c25a92d
|
初始版本
|
2016-09-14 18:06:27 +08:00 |
lily
|
db144df2df
|
merge update
|
2016-09-14 15:52:49 +08:00 |
|
lily
|
7271066a08
|
fix mountPoint
|
2016-09-14 15:50:02 +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
|
817b99dcb0
|
集成
|
2016-09-14 09:33:53 +08:00 |
|
chenlw
|
cb3af77285
|
集成
|
2016-09-14 09:32:55 +08:00 |
|
lily
|
4daefb6d79
|
some fixed
|
2016-09-13 22:57:06 +08:00 |
|
lily
|
b28af5fa13
|
add .settings
|
2016-09-13 14:54:59 +08:00 |
|
lily
|
f308d14166
|
merge web_backend_develope
|
2016-09-13 14:51:56 +08:00 |
|
lily
|
48ae986d5c
|
reset add md5checkout
|
2016-09-13 10:38:09 +08:00 |
|
lily
|
6ce9f75ee7
|
add md5 and getfoldersize
|
2016-09-13 10:08:15 +08:00 |
|
wu ming
|
ceaef2d1b0
|
合并
|
2016-09-12 19:22:35 +08:00 |
|
chenlw
|
355b6e47a4
|
合并，解决冲突
|
2016-09-12 19:18:57 +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 |
|
lily
|
150437e97c
|
fix get Tree data
|
2016-09-11 14:44:04 +08:00 |
|
wu ming
|
a1fa923eed
|
修改DataModelController
|
2016-09-11 08:56:17 +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
|
c5d54bab9e
|
update .gitignore
|
2016-09-09 20:37:44 +08:00 |
|
wu ming
|
261bf0505e
|
aa
|
2016-09-09 20:37:10 +08:00 |