 chenlw
|
010f50dc7d
|
出现异常抛出，
|
9 years ago |
|
chenlw
|
b3c58edc5e
|
自定义异常的描述信息
|
9 years ago |
|
chenlw
|
6b62aa5f54
|
自定义异常的描述信息
|
9 years ago |
|
chenlw
|
58c349c24c
|
OracleConnector类的ConnectionBuilder方法的异常抛出来
|
9 years ago |
|
chenlw
|
c0c48fa89f
|
测试是否能获得oracle连接线程--如果发生异常直接返回500
|
9 years ago |
|
chenlw
|
381d4172ce
|
测试是否能获得oracle连接线程--如果发生异常直接返回500
|
9 years ago |
|
chenlw
|
9184c2b706
|
oracle连接超时后不进行抽取
|
9 years ago |
|
chenlw
|
e469716b7f
|
解决启多个项目时，迁移成功后新建2个datainfo。
|
9 years ago |
|
chenlw
|
bc3dfa2c43
|
解决启多个项目时，迁移成功后新建2个datainfo，
|
9 years ago |
|
chenlw
|
f3fdce01f6
|
解决启多个项目时，迁移成功后新建2个datainfo，（增加findById查询当前迁移的数据详情）。
|
9 years ago |
|
chenlw
|
c20d5a3b45
|
异常记录对象的具体信息
|
9 years ago |
|
chenlw
|
fedbec196c
|
对volume操作成功或失败都返回对应结果
|
9 years ago |
|
chenlw
|
cd6dcbefed
|
对volume操作成功或失败都返回对应结果
|
9 years ago |
|
chenlw
|
7d89d4f4d9
|
执行对oracle数据库的返回集合数据的sql-注释
|
9 years ago |
|
chenlw
|
121bc63dd0
|
连接汇总-创建oracle连接失败-常量
|
9 years ago |
|
chenlw
|
8528272d1c
|
oracleExtract方法,抽取oracle,5秒内返回（线程抽取）
|
9 years ago |
|
chenlw
|
325d3da80a
|
测试链接汇总数据库
|
9 years ago |
|
chenlw
|
96bb4e2ce3
|
测试是否能否连接上？
|
9 years ago |
|
chenlw
|
fe773a6fc3
|
测试是否能获得oracle连接线程
|
9 years ago |
|
chenlw
|
c188cbea05
|
oracle汇总库抽取线程
|
9 years ago |
|
chenlw
|
a4434ecddc
|
测试链接汇总数据库
|
9 years ago |
|
chenlw
|
958beea2f2
|
.
|
9 years ago |
|
chenlw
|
d4cf015596
|
迁移数据的位置在原数据路径或者原数据父目录及其上，不允许迁移
|
9 years ago |
|
chenlw
|
83a10a1f45
|
volume路径为空时，修改
|
9 years ago |
|
chenlw
|
312eeeecda
|
迁移数据，目的数据无权限问题修复
|
9 years ago |
|
chenlw
|
7d4bec698f
|
版本查询问题修复
|
9 years ago |
|
chenlw
|
3829dabbbf
|
删除volume前，先stop volume，如果volume是stopped状态的，则返回0
|
9 years ago |
|
chenlw
|
a2b6affc16
|
volume是started状态的删除失败，删除前先stop,如果volume已经是stop状态，则返回0
|
9 years ago |
|
chenlw
|
86db77dd5c
|
迁移后数据赋权限
|
9 years ago |
|
chenlw
|
44260a720c
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
|
9 years ago |
|
chenlw
|
bf7d7598b7
|
volume停用后导致df命令出错，停用的volume查询不出，volume路径查询出错问题
|
9 years ago |
lily
|
ae98543e24
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
|
9 years ago |
|
lily
|
8763777363
|
fix no peer
|
9 years ago |
|
chenlw
|
94a18d8258
|
shell命令获得正常输出流后就不再去获取异常流
|
9 years ago |
|
chenlw
|
df71293e0d
|
迁移数据时，源目录文件不存在时，迁移失败。
|
9 years ago |
|
chenlw
|
b803b3825c
|
删除数据，只删除该条数据目录的版本目录，不删除系统目录
|
9 years ago |
|
chenlw
|
1bbd61f8c0
|
volume变化后立即更新
|
9 years ago |
|
chenlw
|
84041726c4
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
|
9 years ago |
|
chenlw
|
6aa31f96f5
|
修复gfs连接问题
|
9 years ago |
|
lily
|
c647b81234
|
back
|
9 years ago |
|
lily
|
9b311366a5
|
fix otherConn null
|
9 years ago |
|
lily
|
4002c4d74d
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope
|
9 years ago |
|
lily
|
39435520bf
|
lili
|
9 years ago |
|
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
|
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 |
|
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
|
c13b64f287
|
抽取sql的bug修改
|
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
|
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 |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
9 years ago |
|
chenlw
|
d99c25a92d
|
初始版本
|
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
|
acd377cc4d
|
修复启动oracle，测试连接oracle失败的Bug
|
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 |
|
wu ming
|
a1fa923eed
|
修改DataModelController
|
9 years ago |
|
chenlw
|
3f81d31aa1
|
集成
|
9 years ago |
|
wu ming
|
edceebeb58
|
修改xml错误
|
9 years ago |
|
wu ming
|
b91af86ede
|
增加查询汇总库信息数据库操作
|
9 years ago |
|
wu ming
|
261bf0505e
|
aa
|
9 years ago |
|
wu ming
|
939f2a0de3
|
基础版
|
9 years ago |
|
lily
|
c4b345c6a2
|
fix confict
|
9 years ago |
|
lily
|
a9b02c497b
|
add getVolumeBricks
|
9 years ago |
|
chenlw
|
26f098b74e
|
Merge branch 'Manager_Backend' of https://git.trustie.net/fhx569287825/aggregation-platform into Manager_Backend
Conflicts:
.classpath
.project
build/classes/com/platform/controller/DefaultController.class
src/com/platform/controller/DefaultController.java
src/com/platform/glusterfs/CopyData.java
src/com/platform/glusterfs/GetTreeData.java
|
9 years ago |
|
Chariesliven
|
b32e3c6e07
|
集成李立的代码
|
9 years ago |
|
chenlw
|
5bd29da12e
|
gfs目录获取和复制
|
9 years ago |
|
chenlw
|
e0860af5fc
|
全局异常exp方法修改
|
9 years ago |
|
chenlw
|
91268a91e9
|
异常自定义，code
|
9 years ago |
lili
|
355e6a9b78
|
lili
|
9 years ago |
|
chenlw
|
d7da61c394
|
改编码方式utf8
|
9 years ago |
|
lili
|
6e68a67686
|
nothing
|
9 years ago |
|
Chariesliven
|
8b64314d95
|
增加BaseController全局异常捕获
|
9 years ago |
|
wu ming
|
c66ba751a7
|
汇总平台java后台V1版
|
9 years ago |
