17 Commits (c13b64f28784db7629d1c6f264821fafdb33a88e)

Author	SHA1	Message	Date
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
chenlw	ef099fd1ae	迁移数据	9 years ago
chenlw	cb3af77285	集成	9 years ago
lily	48ae986d5c	reset add md5checkout	9 years ago
lily	d3498ac95e	add bricks size	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	edceebeb58	修改xml错误	9 years ago
wu ming	b91af86ede	增加查询汇总库信息数据库操作	9 years ago
wu ming	5b7257719b	修改masterIP	9 years ago
chenlw	d7da61c394	改编码方式utf8	9 years ago
wu ming	c66ba751a7	汇总平台java后台V1版	9 years ago