 chenlw
|
1c6a50561e
|
脚本校验，新功能开发结束，待测试
|
9 years ago |
|
chenlw
|
7901443ff3
|
修复遇到的bug
|
9 years ago |
|
chenlw
|
ee5acfa3e0
|
联调-脚本的上传、审核、查看、归档
|
9 years ago |
|
chenlw
|
e48af410dd
|
查询信息系统的 脚本信息，并给出 脚本存在、缺失的情况
|
9 years ago |
 wu ming
|
12661a53d3
|
--合并解决冲突
|
9 years ago |
|
wu ming
|
c0eaf8a093
|
--文件压缩功能
|
9 years ago |
|
chenlw
|
a1363a3484
|
最新修改+cfg文件产生+地区下所有系统的xml产生
|
9 years ago |
|
wu ming
|
5b59ff62d5
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
|
9 years ago |
|
wu ming
|
37d3197e60
|
添加文件压缩功能
|
9 years ago |
|
chenlw
|
fefc71355e
|
excel，linux下上传bug
|
9 years ago |
|
chenlw
|
fa3522b71d
|
excel联调完毕
|
9 years ago |
|
chenlw
|
79ba4feb46
|
初次联调，导入excel
|
9 years ago |
|
chenlw
|
59205f5917
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform into
web_backend_develope
Conflicts:
src/com/platform/controller/ExcelController.java
|
9 years ago |
|
chenlw
|
89fde34f71
|
excel的controller
|
9 years ago |
|
wu ming
|
159fe1a3c1
|
---添加文件上传下载功能
|
9 years ago |
|
chenlw
|
7bf01cafea
|
excel controller
|
9 years ago |
|
chenlw
|
0c7fbfe478
|
修改volume删除失败bug
|
9 years ago |
|
chenlw
|
f5182557b2
|
操作volume,brick后，从web_gfs请求volume的最新信息,并返回
|
9 years ago |
|
chenlw
|
3f5818a414
|
volume list远程调用web_gfs服务查询volume信息
|
9 years ago |
|
chenlw
|
c0c48fa89f
|
测试是否能获得oracle连接线程--如果发生异常直接返回500
|
9 years ago |
|
chenlw
|
9184c2b706
|
oracle连接超时后不进行抽取
|
9 years ago |
|
chenlw
|
fedbec196c
|
对volume操作成功或失败都返回对应结果
|
9 years ago |
|
chenlw
|
8528272d1c
|
oracleExtract方法,抽取oracle,5秒内返回（线程抽取）
|
9 years ago |
|
chenlw
|
958beea2f2
|
.
|
9 years ago |
|
chenlw
|
a2b6affc16
|
volume是started状态的删除失败，删除前先stop,如果volume已经是stop状态，则返回0
|
9 years ago |
|
chenlw
|
1bbd61f8c0
|
volume变化后立即更新
|
9 years ago |
|
chenlw
|
3f9a10d873
|
接收前端传入的gfs的volume相关信息，进行新建volume,删除volume,启用volume,停用volume，新增brick，删除brick，
|
9 years ago |
|
chenlw
|
98ff0a1920
|
gfs的volume增删，启用停用，brick的增删
|
9 years ago |
|
chenlw
|
f3b3b6dbf8
|
volume的增删，启动，停止
|
9 years ago |
|
chenlw
|
5837fb8a65
|
冷热区字段更改
|
9 years ago |
|
chenlw
|
e018bf658d
|
volumeType，冷热区的更改
|
9 years ago |
|
wu ming
|
f645d6e119
|
完善抽取功能
|
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
|
bd81c5caa0
|
修改抽取时的bug
|
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
|
83170155be
|
--合并
|
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
|
e1e273fb1c
|
update .gitignore
|
9 years ago |
|
chenlw
|
19e9b502ec
|
接收请求方式修改
|
9 years ago |
|
chenlw
|
b252d63312
|
联调之前测试后修改请求接收方式
|
9 years ago |
|
wu ming
|
d3e79bd886
|
合并----
|
9 years ago |
|
wu ming
|
5ba88b2d41
|
解决冲突----
|
9 years ago |
