chenlw
|
c0c48fa89f
|
测试是否能获得oracle连接线程--如果发生异常直接返回500
|
9 years ago |
chenlw
|
9184c2b706
|
oracle连接超时后不进行抽取
|
9 years ago |
chenlw
|
8528272d1c
|
oracleExtract方法,抽取oracle,5秒内返回(线程抽取)
|
9 years ago |
chenlw
|
958beea2f2
|
.
|
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
|
172b1b512b
|
Merge branch 'web_backend_develope' of
https://git.trustie.net/fhx569287825/aggregation-platform
Conflicts:
src/com/platform/controller/DataModelController.java
|
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 |
wu ming
|
e317bfbacc
|
nothing
|
9 years ago |
chenlw
|
f4d9113d4c
|
修改字段
|
9 years ago |
chenlw
|
b19225edbe
|
地区和系统查询
|
9 years ago |
chenlw
|
d99c25a92d
|
初始版本
|
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
|
cb3af77285
|
集成
|
9 years ago |
lily
|
f308d14166
|
merge web_backend_develope
|
9 years ago |
lily
|
48ae986d5c
|
reset add md5checkout
|
9 years ago |
wu ming
|
ceaef2d1b0
|
合并
|
9 years ago |
chenlw
|
355b6e47a4
|
合并,解决冲突
|
9 years ago |
chenlw
|
ab64ab35d2
|
集成
|
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 |
wu ming
|
a1fa923eed
|
修改DataModelController
|
9 years ago |
chenlw
|
3f81d31aa1
|
集成
|
9 years ago |
wu ming
|
b91af86ede
|
增加查询汇总库信息数据库操作
|
9 years ago |
wu ming
|
261bf0505e
|
aa
|
9 years ago |
wu ming
|
939f2a0de3
|
基础版
|
9 years ago |
chenlw
|
d7da61c394
|
改编码方式utf8
|
9 years ago |
Chariesliven
|
8b64314d95
|
增加BaseController全局异常捕获
|
9 years ago |
wu ming
|
c66ba751a7
|
汇总平台java后台V1版
|
9 years ago |