Commit Graph

368 Commits

Author SHA1 Message Date
coco11563 c62215120c done the person distinct 2019-07-26 16:10:35 +08:00
coco11563 a76ad0b868 bug fix 2019-07-26 11:23:43 +08:00
coco11563 e9ddb1d1b0 bug fix 2019-07-26 11:20:45 +08:00
coco11563 7aadd02b0a bug fix 2019-07-26 10:29:56 +08:00
coco11563 126f9f8383 bug fix 2019-07-26 10:27:35 +08:00
Shaow 5467dd9544
Update RedisUtil.scala
forced to update redis utils
2019-07-26 10:24:00 +08:00
judy0131 0c6e0a89c5 modify spark.version to 2.1.0 2019-07-26 10:18:24 +08:00
judy_0131 3c546ed84f modify SelecHiveQl inport 2019-07-26 10:07:43 +08:00
coco11563 f4ccd0afee Merge remote-tracking branch 'origin/master' 2019-07-26 09:58:04 +08:00
coco11563 6576e70280 bug fix 2019-07-26 09:57:44 +08:00
coco11563 01189e97aa file update 2019-07-26 09:56:32 +08:00
judy_0131 57ce7273c9 test 2019-07-26 08:49:39 +08:00
judy0131 01bf0250f2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	piflow-bundle/piflow-bundle.iml
#	piflow-core/piflow-core.iml
2019-07-26 08:46:40 +08:00
judy0131 10756edc57 test 2019-07-26 08:46:17 +08:00
coco11563 7c6ce8313f Merge branch 'master' of C:\Users\coco1\IdeaProjects\piflow with conflicts. 2019-07-25 15:41:28 +08:00
coco11563 fa8c203207 adding passwd config in redis 2019-07-25 11:34:59 +08:00
coco11563 bf9f235464 done the redis persist 2019-07-25 11:24:36 +08:00
judy0131 b589211c1a fix bug 2019-07-23 18:10:47 +08:00
judy0131 b85fd2cc54 1.optimize code
2.fix bug
2019-07-22 11:14:36 +08:00
judy0131 db63cfa57d Merge remote-tracking branch 'origin/master' 2019-07-19 18:35:17 +08:00
judy0131 acf29d16bd increment for jdbc type 2019-07-19 18:34:59 +08:00
coco11563 1b46c965af done the table join 2019-07-18 15:26:11 +08:00
coco11563 2c837f864e done the id expansion 2019-07-18 15:04:11 +08:00
coco11563 02ad523f53 adding nsfc module 2019-07-17 18:01:26 +08:00
coco11563 dd280049d4 neo4j import bug fix 2019-07-16 15:46:29 +08:00
or b6330a4130
Update DoMapStop.scala
update domap
2019-06-11 15:07:14 +08:00
judy0131 8914f9cac8 1.schedule flow,group,project by cron
2.stop schedule
2019-05-22 18:45:25 +08:00
judy0131 7deb8946c7 support run project API 2019-05-05 15:34:35 +08:00
judy0131 1754a233cd 1.add json util
2. fix bug: launch spark application for each flow in FlowGroup
2019-04-30 16:29:22 +08:00
judy0131 76fa9280c2 support run FlowGroup API 2019-04-26 18:02:54 +08:00
yanfqidong0604 912dae9fe2 Optimizing the reading and writing of MongoDB
QiDong Yang
2019-04-15 15:23:52 +08:00
yanfqidong0604 e044ffdaa5 Add function to the Stop of PutEs.scala
QiDong Yang
2019-04-15 14:13:40 +08:00
yanggang 3d8dd3720c mv all *.java to java package 2019-04-09 19:08:54 +08:00
judy0131 7d9133c025 1.modify scala-maven-plugin for both java and scala file
2.fixbug
2019-04-09 15:20:22 +08:00
huchuan 29b8e4b9a6 change 3 icons 2019-04-01 12:43:17 +08:00
yanggang 7fe26212f6 change group 2019-03-29 13:57:31 +08:00
huchuan ce3ab90c21 Merge remote-tracking branch 'origin/master' 2019-03-29 11:31:25 +08:00
huchuan 91ce8361b0 add asr,nlp,imageProcess stops 2019-03-29 11:29:53 +08:00
yanggang 58c97dfe46 Description of Change 2019-03-28 14:18:29 +08:00
yanggang 3772d4868c commit json 2019-03-28 10:52:33 +08:00
yanggang e0190d6f67 Merge remote-tracking branch 'origin/master' 2019-03-27 15:46:38 +08:00
yanggang 7452ad34d7 updata microorganism 2019-03-27 15:46:13 +08:00
judy0131 a0764ceb68 1. modify show data function
2. fix bug: when more than 5 requests of starting flow are posted, piflow server will get exception:No element passed in the last 1 minute
2019-03-27 15:09:34 +08:00
yanfqidong0604 e9f354457f neo4j
qidong yang
2019-03-26 15:03:46 +08:00
judy0131 4080568461 fix spelling mistakes 2019-03-21 16:48:33 +08:00
judy0131 30a2b5c936 modify description of stop 2019-03-18 14:39:14 +08:00
judy0131 40e592fa30 remove icons which is unused 2019-03-17 09:28:37 +08:00
judy0131 d7addc00d4 modify the icon of solr, streaming and xml group 2019-03-17 09:25:19 +08:00
judy0131 b80515a267 modify the icon of mongo,neo4j,rdf, redis and script group 2019-03-17 09:14:07 +08:00
judy0131 5ce5475da5 modify the icon of meachine learning related group 2019-03-17 08:41:48 +08:00
judy0131 51b7e2a44f modify the icon of kafka, memcache and microorganism group 2019-03-17 08:27:10 +08:00
judy0131 816ebbd5a5 modify the icon of jdbc and json group 2019-03-17 08:02:28 +08:00
judy0131 76131eaf8c 1.modify the icon of hive, http and internetWorm group
2.add icons
2019-03-17 07:52:19 +08:00
judy0131 0f5a0192a4 modify the icon of hbase and hdfs group 2019-03-17 07:34:24 +08:00
judy0131 8afaf376a3 modify the icon of ftp and graphx 2019-03-16 22:47:16 +08:00
judy0131 4b5f7a6d32 modify the icon of elasticsearch, excel and file group 2019-03-16 22:39:00 +08:00
judy0131 447c238636 1.update the icon of clean, common, csv group
2.fix bug: flow resources is not effective
2019-03-16 22:26:25 +08:00
judy0131 f1facfa99e modify the icons of clean and common group 2019-03-15 16:43:50 +08:00
yanggang 84a7e75b92 updata describe 2019-03-12 11:04:29 +08:00
yanggang b7b93b9a1f upload kegg/medline stop ,rename microo stop and delete repetition stop 2019-03-12 10:59:08 +08:00
yanfqidong0604 193d5dd04b impala
qidong yang
2019-03-11 16:39:48 +08:00
yanfqidong0604 70b2753145 impala
qidong yang
2019-03-11 16:24:11 +08:00
yanfqidong0604 0f3f2dafab neo4j
qidong yang
2019-03-11 10:47:58 +08:00
judy0131 2e9ad38fca 1.modify streaming stop's property descriptor
2.modify TextFileStreaming example
2019-03-07 17:09:01 +08:00
judy0131 0936d4b495 1.verify flume streaming example
2.add debugData api
2019-03-07 15:59:10 +08:00
yanggang 375af3a1ab Merge remote-tracking branch 'origin/master' 2019-03-05 16:02:11 +08:00
yanggang 076ea0173b update bioProject 2019-03-05 16:01:27 +08:00
judy0131 ca8abccf0c add streaming window function 2019-03-05 15:59:56 +08:00
judy0131 cd615ad58e set batchDuration from streamingStop 2019-03-01 16:16:25 +08:00
judy0131 e28fdf3159 set icon from streaming group's stops 2019-03-01 15:18:32 +08:00
judy0131 91561ad010 support flume streaming 2019-03-01 13:34:47 +08:00
judy0131 c28fee4c1e support kafka streaming 2019-02-28 11:00:21 +08:00
yanggang 695e61e455 update microorganism stop 2019-02-27 13:47:06 +08:00
judy0131 0bd5c9bcf5 Merge remote-tracking branch 'origin/master' 2019-02-27 10:58:55 +08:00
judy0131 889b83f475 fix getGroups api bug 2019-02-27 10:58:34 +08:00
yanfqidong0604 03c939f1ed QiDong Yang
Introduction of dependency on FTP server download
2019-02-25 10:59:34 +08:00
yanfqidong0604 7f48516f27 QiDong Yang
Introduction of dependency on FTP server download
2019-02-25 10:57:59 +08:00
yanfqidong0604 880b55a7af QiDong Yang
Full-scale testing of JSON and final stop code
2019-02-25 10:36:08 +08:00
judy0131 3d54df81f4 support streaming 2019-02-20 18:37:23 +08:00
yanggang cd0cadeaf0 delete json,updata port 2019-01-31 17:36:49 +08:00
yanggang d64e96f631 Merge remote-tracking branch 'origin/master' 2019-01-30 15:05:43 +08:00
yanggang 0d1608f2b3 修改描述信息,提交微生物stop 2019-01-30 15:02:42 +08:00
judy0131 dd09d8c6d1 fix bug: jdbcRead stop's properties repeat 2019-01-30 10:41:28 +08:00
yanfqidong0604 2a2d029d19 In the HDFS filesystem, select the file you need according to the name of the file
Whether a parameter of decompression stop must be adjusted
QiDong Yang
2019-01-29 17:40:44 +08:00
judy0131 b48ff0bfc2 show flow debug data by path 2019-01-23 11:27:05 +08:00
yanfqidong0604 11a15d6ca7 YangQiDong 2019-01-18 16:56:22 +08:00
yanfqidong0604 736fc3592a YangQiDong 2019-01-18 16:55:47 +08:00
yanfqidong0604 553f36760d YangQiDong 2019-01-18 16:32:21 +08:00
yanfqidong0604 6d483b7461 YangQiDong 2019-01-18 16:27:46 +08:00
yanfqidong0604 d027f5e589 YangQiDong 2019-01-18 16:13:22 +08:00
yanfqidong0604 c2ae0447d7 YangQiDong 2019-01-18 15:05:43 +08:00
yanfqidong0604 4bde8b0f23 qidong yang 2019-01-18 14:04:39 +08:00
yanfqidong0604 14f1da58f2 qidong yang 2019-01-16 11:13:33 +08:00
judy0131 9cba0f2e6e show dataFrame when job is completed 2019-01-14 16:54:22 +08:00
yanfqidong0604 762368a2a9 qidong yang 2019-01-11 18:45:42 +08:00
yanfqidong0604 588bc66125 qidong yang 2019-01-11 16:53:25 +08:00
yanfqidong0604 770d46aee1 qidong yang 2019-01-11 16:04:42 +08:00
yanfqidong0604 1211afab88 Image Modification of Microbial Data Stop
qidong yang
2019-01-11 15:32:56 +08:00
yanfqidong0604 2e1ecd0087 join stop
qidong yang
2019-01-11 15:14:12 +08:00
yanfqidong0604 180ef7a181 join stop
qidong yang
2019-01-11 15:02:38 +08:00