 chenlw
|
a9b94717c1
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
src/com/platform/utils/GanymedSSH.java
|
9 years ago |
|
chenlw
|
3f9a10d873
|
接收前端传入的gfs的volume相关信息，进行新建volume,删除volume,启用volume,停用volume，新增brick，删除brick，
|
9 years ago |
lily
|
45bfd2eca8
|
add the connection pool
|
9 years ago |
|
lily
|
984d6628f9
|
lili
|
9 years ago |
|
lily
|
ad4620c43e
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
|
9 years ago |
|
chenlw
|
98ff0a1920
|
gfs的volume增删，启用停用，brick的增删
|
9 years ago |
|
lily
|
b8f723d05d
|
lili
|
9 years ago |
|
lily
|
ad07f0874f
|
alter config
|
9 years ago |
|
chenlw
|
278c3d3aae
|
修改迁移时，volume的path未写入的bug
|
9 years ago |
 wu ming
|
f645d6e119
|
完善抽取功能
|
9 years ago |
|
chenlw
|
ee7128c617
|
日志bug修改
|
9 years ago |
|
chenlw
|
191aecd828
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
src/com/platform/controller/DataModelController.java
src/com/platform/oracle/OracleConnector.java
src/com/platform/service/OracleExtractHelper.java
src/com/platform/service/impl/OracleExtractServiceImpl.java
|
9 years ago |
|
chenlw
|
9a8b55a674
|
读取日志
|
9 years ago |
|
wu ming
|
983a2ce749
|
合并--9.22
|
9 years ago |
|
wu ming
|
0a5b380ee7
|
for merge
|
9 years ago |
|
chenlw
|
c13b64f287
|
抽取sql的bug修改
|
9 years ago |
|
chenlw
|
bd81c5caa0
|
修改抽取时的bug
|
9 years ago |
|
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
|
9 years ago |
|
chenlw
|
4d8078c6c1
|
调试修改代码-联调
|
9 years ago |
|
wu ming
|
faadafadfd
|
--完善功能
|
9 years ago |
|
wu ming
|
e1e273fb1c
|
update .gitignore
|
9 years ago |
|
wu ming
|
d4db086706
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
|
9 years ago |
|
chenlw
|
09064c9d9e
|
多字段模糊查询数据，
|
9 years ago |
|
wu ming
|
5ba88b2d41
|
解决冲突----
|
9 years ago |
|
wu ming
|
e317bfbacc
|
nothing
|
9 years ago |
|
chenlw
|
f4d9113d4c
|
修改字段
|
9 years ago |
|
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
|
9 years ago |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
9 years ago |
|
lily
|
db144df2df
|
merge update
|
9 years ago |
|
lily
|
7271066a08
|
fix mountPoint
|
9 years ago |
|
wu ming
|
d2f5305d2b
|
合并-9.14
|
9 years ago |
|
wu ming
|
608e658d3a
|
修复启动oracle服务，测试连接oracle的Bub
|
9 years ago |
|
chenlw
|
ef099fd1ae
|
迁移数据
|
9 years ago |
|
chenlw
|
817b99dcb0
|
集成
|
9 years ago |
|
chenlw
|
cb3af77285
|
集成
|
9 years ago |
|
lily
|
4daefb6d79
|
some fixed
|
9 years ago |
|
lily
|
f308d14166
|
merge web_backend_develope
|
9 years ago |
|
lily
|
48ae986d5c
|
reset add md5checkout
|
9 years ago |
|
lily
|
6ce9f75ee7
|
add md5 and getfoldersize
|
9 years ago |
|
wu ming
|
ceaef2d1b0
|
合并
|
9 years ago |
|
chenlw
|
355b6e47a4
|
合并，解决冲突
|
9 years ago |
|
chenlw
|
ab64ab35d2
|
集成
|
9 years ago |
|
lily
|
d3498ac95e
|
add bricks size
|
9 years ago |
|
chenlw
|
e2e392e319
|
数据逻辑处理，oracle抽取处理，迁移数据
|
9 years ago |
|
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
|
9 years ago |
|
lily
|
150437e97c
|
fix get Tree data
|
9 years ago |
|
chenlw
|
3f81d31aa1
|
集成
|
9 years ago |
|
lily
|
c4b345c6a2
|
fix confict
|
9 years ago |
|
lily
|
a9b02c497b
|
add getVolumeBricks
|
9 years ago |
|
Chariesliven
|
b32e3c6e07
|
集成李立的代码
|
9 years ago |
