Merge branch 'master' of git.wanmeizhensuo.com:zhaojianwei/bi-report

conf/en-cn.properties

@@ -7,4 +7,5 @@ meigou-detail-page=美购详情页
 meigou-detail-page-dispense-pv=美购详情页分发pv
 meigou-detail-page-dispense-uv=美购详情页分发uv
 meigou-detail-page-source-pv=美购详情页来源pv
-meigou-detail-page-source-uv=美购详情页来源uv
+meigou-detail-page-source-uv=美购详情页来源uv
\ No newline at end of file
+daily_content_data=内容日报-新
\ No newline at end of file

jobs/daily_content_data/step1_1.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_device_day_active_status
\ No newline at end of file

jobs/daily_content_data/step1_10.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_answer_view
\ No newline at end of file

jobs/daily_content_data/step1_11.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_topicreply_view
\ No newline at end of file

jobs/daily_content_data/step1_12.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_answer_reply_view
\ No newline at end of file

jobs/daily_content_data/step1_13.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_tractate_reply_view
\ No newline at end of file

jobs/daily_content_data/step1_2.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online bl_hdfs_maidian_updates
\ No newline at end of file

jobs/daily_content_data/step1_3.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_device_updates
\ No newline at end of file

jobs/daily_content_data/step1_4.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_user_updates
\ No newline at end of file

jobs/daily_content_data/step1_5.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online bl_hdfs_operation_updates
\ No newline at end of file

jobs/daily_content_data/step1_6.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_tractate_view
\ No newline at end of file

jobs/daily_content_data/step1_7.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_diary_view
\ No newline at end of file

jobs/daily_content_data/step1_8.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_problem_view
\ No newline at end of file

jobs/daily_content_data/step1_9.job

+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_question_view
\ No newline at end of file

jobs/daily_content_data/step2.job

+#step2.job
+type=command
+dependencies=step1_1,step1_2,step1_3,step1_4,step1_5,step1_6,step1_7,step1_8,step1_9,step1_10,step1_11,step1_12,step1_13
+command=curl -X GET http://localhost:8553/api/report/sendEmail/weiyimin@igengmei.com/zhaojianwei@igengmei.com,mazhimo@igengmei.com/daily_content_data
\ No newline at end of file