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
|
6aa31f96f5
|
修复gfs连接问题
|
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
|
40158bb583
|
放开spring内存监听
|
9 years ago |
|
chenlw
|
3ae6a6e38d
|
.
|
9 years ago |
|
lily
|
b8f723d05d
|
lili
|
10 years ago |
|
lily
|
ad07f0874f
|
alter config
|
10 years ago |
|
chenlw
|
d8732dee1f
|
配置文件修改，添加mapper文件扫入
|
10 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
|
10 years ago |
|
chenlw
|
9c67da3c63
|
合并
|
10 years ago |
 wu ming
|
34e31fbc6d
|
解决抽取执行失败问题
|
10 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
|
10 years ago |
|
chenlw
|
2cde2f47a1
|
修改
|
10 years ago |
|
wu ming
|
983a2ce749
|
合并--9.22
|
10 years ago |
|
chenlw
|
0b37e589f9
|
抽取修改
|
10 years ago |
|
chenlw
|
cd70315dc7
|
chou qu oracle
|
10 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
|
10 years ago |
|
wu ming
|
57a2cd17af
|
修改oracle连接策略
|
10 years ago |
|
wu ming
|
5ba88b2d41
|
解决冲突----
|
10 years ago |
|
wu ming
|
e317bfbacc
|
nothing
|
10 years ago |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
10 years ago |
|
wu ming
|
d2f5305d2b
|
合并-9.14
|
10 years ago |
|
wu ming
|
acd377cc4d
|
修复启动oracle，测试连接oracle失败的Bug
|
10 years ago |
|
wu ming
|
608e658d3a
|
修复启动oracle服务，测试连接oracle的Bub
|
10 years ago |
|
chenlw
|
ef099fd1ae
|
迁移数据
|
10 years ago |
|
chenlw
|
cb3af77285
|
集成
|
10 years ago |
|
lily
|
48ae986d5c
|
reset add md5checkout
|
10 years ago |
|
chenlw
|
ab64ab35d2
|
集成
|
10 years ago |
|
lily
|
d3498ac95e
|
add bricks size
|
10 years ago |
|
chenlw
|
e2e392e319
|
数据逻辑处理，oracle抽取处理，迁移数据
|
10 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
|
10 years ago |
|
chenlw
|
3f81d31aa1
|
集成
|
10 years ago |
|
wu ming
|
edceebeb58
|
修改xml错误
|
10 years ago |
|
wu ming
|
b91af86ede
|
增加查询汇总库信息数据库操作
|
10 years ago |
|
wu ming
|
939f2a0de3
|
基础版
|
10 years ago |
|
wu ming
|
5b7257719b
|
修改masterIP
|
10 years ago |
|
Chariesliven
|
b32e3c6e07
|
集成李立的代码
|
10 years ago |
|
chenlw
|
d7da61c394
|
改编码方式utf8
|
10 years ago |
|
wu ming
|
c66ba751a7
|
汇总平台java后台V1版
|
10 years ago |
