Merge branch 'zhaojianwei' into 'master'

add shell dir

See merge request zhaojianwei/bi-report!7

.idea/workspace.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="034b59f7-f608-4144-b0af-f6951647bd51" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/lib/shell/hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/hive.sh" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CodeStyleSettingsInfer">
+    <option name="done" value="true" />
+  </component>
+  <component name="ComposerSettings">
+    <execution>
+      <executable />
+    </execution>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectCodeStyleSettingsMigration">
+    <option name="version" value="1" />
+  </component>
+  <component name="ProjectId" id="1dfQ0VEii7hX7vb7p4D7taxyaw0" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
+      <setting name="replType" value="NREPL" />
+      <setting name="execution" value="LEININGEN" />
+      <setting name="jvmArgs" value="" />
+      <setting name="parameters" value="" />
+      <setting name="workingDir" value="" />
+      <setting name="profiles" value="" />
+      <setting name="aliases" value="" />
+      <setting name="fixLineNumbers" value="false" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="ClojureREPL" factoryName="Remote" activateToolWindowBeforeRun="false">
+      <setting name="host" value="" />
+      <setting name="port" value="0" />
+      <setting name="replType" value="SOCKET" />
+      <setting name="configType" value="SPECIFY" />
+      <setting name="fixLineNumbers" value="false" />
+      <method v="2" />
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="034b59f7-f608-4144-b0af-f6951647bd51" name="Default Changelist" comment="" />
+      <created>1592813444854</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1592813444854</updated>
+      <workItem from="1592813446154" duration="2153000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+</project>
\ No newline at end of file

bin/pull_ydl.sh

+#!/bin/bash
+
+git checkout yindanlei
+git pull origin yindanlei
\ No newline at end of file

jobs/daily_recommend_strategy/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
-command=curl -X GET http://localhost:8553/api/report/execSql?name=daily_recommend_strategy_insert
\ No newline at end of file
+command=/home/bi/bi-report/shells/daily_recommend_strategy/daily_recommend_strategy.sh
\ No newline at end of file

lib/shell/hive.sh

 #!/bin/bash
 
 # 定义变量方便修改
-hive=/opt/hive/hive-1.1.0-cdh5.16.1/bin/beeline
+hive="/opt/spark/spark-2.4.5-bin-hadoop2.7/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter003:10010/online -n data"
 
 # 如果是输入的日期按照取输入日期；如果没输入日期取当前时间的前一天
-if [ -n $1 ] ;then
-	partition_day=$1
+if [ -n "$1" ] ;then
+  partition_day=$1
 else
-	partition_day=`date --date="$V_PARYMD -1 day" +%Y%m%d`
+  partition_day=`date --date="-1 day" +%Y%m%d`
 fi
 
 sql="
@@ -236,7 +236,7 @@ FROM
             FROM online.bl_hdfs_maidian_updates
             WHERE partition_date>=regexp_replace(DATE_SUB(current_date,1) ,'-','')
             AND partition_date<regexp_replace((current_date),'-','')
-            AND (get_json_object(params['extra_param'], '$.type')='交互栏'
+            AND (get_json_object(params['extra_param'], '$.type')='���互栏'
                    or get_json_object(params['extra_param'], '$.jump_from')='msg_link')
             AND action='on_click_card'
             and params['card_content_type']='service'