 chenlw
|
9bd7a694df
|
合并
|
9 years ago |
|
chenlw
|
3f9a10d873
|
接收前端传入的gfs的volume相关信息，进行新建volume,删除volume,启用volume,停用volume，新增brick，删除brick，
|
9 years ago |
|
chenlw
|
40158bb583
|
放开spring内存监听
|
9 years ago |
|
chenlw
|
3ae6a6e38d
|
.
|
9 years ago |
|
chenlw
|
98ff0a1920
|
gfs的volume增删，启用停用，brick的增删
|
9 years ago |
|
chenlw
|
d8732dee1f
|
配置文件修改，添加mapper文件扫入
|
9 years ago |
|
chenlw
|
f3b3b6dbf8
|
volume的增删，启动，停止
|
9 years ago |
|
chenlw
|
278c3d3aae
|
修改迁移时，volume的path未写入的bug
|
9 years ago |
|
chenlw
|
5837fb8a65
|
冷热区字段更改
|
9 years ago |
|
chenlw
|
e018bf658d
|
volumeType，冷热区的更改
|
9 years ago |
|
chenlw
|
5d38743d08
|
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/utils/FileOperateHelper.java
|
9 years ago |
|
chenlw
|
9c67da3c63
|
合并
|
9 years ago |
 wu ming
|
f645d6e119
|
完善抽取功能
|
9 years ago |
|
wu ming
|
34e31fbc6d
|
解决抽取执行失败问题
|
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
|
2cde2f47a1
|
修改
|
9 years ago |
|
wu ming
|
f791e9506a
|
修改--9.22
|
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
|
058a232cbb
|
抽取修改
|
9 years ago |
|
chenlw
|
0b37e589f9
|
抽取修改
|
9 years ago |
|
chenlw
|
c13b64f287
|
抽取sql的bug修改
|
9 years ago |
|
chenlw
|
bd81c5caa0
|
修改抽取时的bug
|
9 years ago |
|
chenlw
|
cd70315dc7
|
chou qu oracle
|
9 years ago |
|
chenlw
|
7ca8118466
|
chouqu
|
9 years ago |
|
chenlw
|
ec4dd98377
|
chou qu oracle
|
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
|
e42e9b9554
|
update .gitignore
|
9 years ago |
|
wu ming
|
a82a9b0397
|
update .gitignore
|
9 years ago |
|
wu ming
|
0412d82278
|
合并--9.20
|
9 years ago |
|
wu ming
|
83170155be
|
--合并
|
9 years ago |
|
chenlw
|
b56e1a8deb
|
恢复test
|
9 years ago |
|
chenlw
|
a1310b127d
|
会略
|
9 years ago |
|
chenlw
|
172b1b512b
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform
Conflicts:
src/com/platform/controller/DataModelController.java
|
9 years ago |
|
wu ming
|
d35115800d
|
update .gitignore
|
9 years ago |
|
wu ming
|
e1e273fb1c
|
update .gitignore
|
9 years ago |
|
chenlw
|
19e9b502ec
|
接收请求方式修改
|
9 years ago |
|
chenlw
|
b252d63312
|
联调之前测试后修改请求接收方式
|
9 years ago |
|
wu ming
|
57a2cd17af
|
修改oracle连接策略
|
9 years ago |
|
wu ming
|
d4db086706
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
|
9 years ago |
|
wu ming
|
d3e79bd886
|
合并----
|
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 |
