 wu ming
|
12661a53d3
|
--合并解决冲突
|
9 years ago |
|
wu ming
|
c0eaf8a093
|
--文件压缩功能
|
9 years ago |
 chenlw
|
7d0c47afe2
|
配置
|
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
|
8a8e52357d
|
修改表
|
9 years ago |
|
chenlw
|
e2f10b46a5
|
zip
|
9 years ago |
|
chenlw
|
cbb42e1a3d
|
联调之配置文件
|
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
|
969500a9a6
|
Mybatis配置修改
|
9 years ago |
|
wu ming
|
159fe1a3c1
|
---添加文件上传下载功能
|
9 years ago |
|
chenlw
|
30892360c7
|
excel依赖包
|
9 years ago |
|
wu ming
|
87c1b7ab15
|
--nothing
|
9 years ago |
|
chenlw
|
8422558962
|
模板
|
9 years ago |
|
chenlw
|
d9033ce2a5
|
文件上传配置
|
9 years ago |
|
chenlw
|
c1ef5d74c7
|
jfinal
|
9 years ago |
|
chenlw
|
7cb4d16f55
|
依赖包
|
9 years ago |
|
chenlw
|
4ab1c353c5
|
配置加入HttpClientConstant_URL_IP_PORT
|
9 years ago |
|
chenlw
|
4b7ad54b1b
|
将gfs项目独立出来-jar引用
|
9 years ago |
|
wu ming
|
591512730f
|
Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope
|
9 years ago |
|
wu ming
|
564b286856
|
--nonthing
|
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
|
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
|
9 years ago |
|
lily
|
ad07f0874f
|
alter config
|
9 years ago |
|
chenlw
|
d8732dee1f
|
配置文件修改，添加mapper文件扫入
|
9 years ago |
|
wu ming
|
caf65a0996
|
增加数据冷热分区
|
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
|
34e31fbc6d
|
解决抽取执行失败问题
|
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
|
983a2ce749
|
合并--9.22
|
9 years ago |
|
chenlw
|
0b37e589f9
|
抽取修改
|
9 years ago |
|
chenlw
|
cd70315dc7
|
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 |
|
wu ming
|
57a2cd17af
|
修改oracle连接策略
|
9 years ago |
|
wu ming
|
5ba88b2d41
|
解决冲突----
|
9 years ago |
|
wu ming
|
e317bfbacc
|
nothing
|
9 years ago |
|
chenlw
|
b19225edbe
|
地区和系统查询
|
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
|
cb3af77285
|
集成
|
9 years ago |
