Merge branch 'wangyan' into 'master'

Wangyan See merge request !17

Merge branch 'wangyan' into 'master'
Wangyan See merge request !17
0dc20455 · 赵建伟 · 7f844cc0 · 384e3c97 · 7f844cc0 · 0dc20455
Commit 0dc20455 authored Jul 20, 2020 by 赵建伟
30 changed files
--- a/.gitignore
+++ b/.gitignore
-
-.idea/dataSources/
-lib/java/bi-report-service/.idea/workspace.xml
--- a/bin/pull_master.sh
+++ b/bin/pull_master.sh
--- a/bin/pull_wym.sh
+++ b/bin/pull_wym.sh
--- a/bin/pull_ydl.sh
+++ b/bin/pull_ydl.sh
--- a/bin/pull_zjw.sh
+++ b/bin/pull_zjw.sh
--- a/lib/shell/hive
+++ b/lib/shell/hive
--- a/pm/daily_content_data/readme.txt
+++ b/pm/daily_content_data/readme.txt
--- a/pm/daily_recommend_strategy/readme.txt
+++ b/pm/daily_recommend_strategy/readme.txt
--- a/pm/meigou_detail_page/readme.txt
+++ b/pm/meigou_detail_page/readme.txt
--- a/pm/search_related/readme.txt
+++ b/pm/search_related/readme.txt
--- a/pm/zhuanzhen_base_data/en-cn.properties
+++ b/pm/zhuanzhen_base_data/en-cn.properties
+search_related=转诊基础明细数据表
+zhuanzhen_base_data=转诊基础明细数据表
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_1.job
+++ b/pm/zhuanzhen_base_data/job/step1_1.job
+#step1_1.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_bdtransfer_view
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_2.job
+++ b/pm/zhuanzhen_base_data/job/step1_2.job
+#step1_2.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_bdtransfer_singlerecord_view
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_3.job
+++ b/pm/zhuanzhen_base_data/job/step1_3.job
+#step1_3.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_meigou_order_detail
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_4.job
+++ b/pm/zhuanzhen_base_data/job/step1_4.job
+#step1_4.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_budan_view
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_6.job
+++ b/pm/zhuanzhen_base_data/job/step1_6.job
+#step1_6.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_bdtransfer_singlerecord_project_view
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_7.job
+++ b/pm/zhuanzhen_base_data/job/step1_7.job
+#step1_7.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online tl_hdfs_api_tag_view
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_8.job
+++ b/pm/zhuanzhen_base_data/job/step1_8.job
+#step1_8.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive tl tl_zx_api_bdtransfer_willing_project
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step1_9.job
+++ b/pm/zhuanzhen_base_data/job/step1_9.job
+#step1_9.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online bl_city_updates
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/step2.job
+++ b/pm/zhuanzhen_base_data/job/step2.job
+#step2.job
+type=command
+dependencies=step1_1,step1_2,step1_3,step1_4,step1_6,step1_7,step1_8,step1_9
+command=curl -X GET http://localhost:8553/api/report/email/zhuanzhen_base_data/zhouming@igengmei.com,jianzirui@igengmei.com/wangyan@igengmei.com,zhaofei@igengmei.com
\ No newline at end of file
--- a/pm/zhuanzhen_base_data/job/zhuanzhen_base_data.zip
+++ b/pm/zhuanzhen_base_data/job/zhuanzhen_base_data.zip
--- a/pm/zhuanzhen_base_data/report/zhuanzhen_base_data.sql
+++ b/pm/zhuanzhen_base_data/report/zhuanzhen_base_data.sql
--- a/sbin/build.sh
+++ b/sbin/build.sh
--- a/sbin/pull_master.sh
+++ b/sbin/pull_master.sh
--- a/sbin/pull_wym.sh
+++ b/sbin/pull_wym.sh
--- a/sbin/pull_zjw.sh
+++ b/sbin/pull_zjw.sh
--- a/sbin/push.sh
+++ b/sbin/push.sh
--- a/sbin/replace.sh
+++ b/sbin/replace.sh
--- a/sbin/start_service.sh
+++ b/sbin/start_service.sh
--- a/sbin/stop_service.sh
+++ b/sbin/stop_service.sh