Skip to content

B
bi-report
Commit 1f2d1fb0 authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent 27bb383a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 19 deletions
.idea/workspace.xml
View file @ 1f2d1fb0
......@@ -2,7 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/sbin/test.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/meigou-detail-page.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step1_1.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step1_3.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step1_4.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step2.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sqls/meigou-detail-page/meigou-detail-page-dispense-pv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sqls/meigou-detail-page/meigou-detail-page-dispense-uv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sqls/meigou-detail-page/meigou-detail-page-source-pv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sqls/meigou-detail-page/meigou-detail-page-source-uv.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/conf/en-cn.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step1_2.job" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -60,7 +70,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/sqls/demo" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/jobs/meigou-detail-page" />
<property name="project.structure.last.edited" value="Global Libraries" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
......@@ -75,9 +85,11 @@
<recent name="$PROJECT_DIR$/lib/shell" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/sqls/demo" />
<recent name="$PROJECT_DIR$/lib/shell" />
<recent name="$PROJECT_DIR$/jobs/demo" />
<recent name="$PROJECT_DIR$/jobs/meigou-detail-page" />
<recent name="$PROJECT_DIR$/jobs" />
<recent name="$PROJECT_DIR$/sqls/meigou-detail-page" />
<recent name="$PROJECT_DIR$/sqls/shell" />
<recent name="$PROJECT_DIR$/jobs/report_service" />
</key>
</component>
<component name="RunManager">
......@@ -123,7 +135,7 @@
<workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="7993000" />
<workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="4196000" />
<workItem from="1588344251422" duration="8938000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
......@@ -265,7 +277,21 @@
<option name="project" value="LOCAL" />
<updated>1588232535161</updated>
</task>
<option name="localTasksCounter" value="21" />
<task id="LOCAL-00021" summary="update codes">
<created>1588522573935</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1588522573935</updated>
</task>
<task id="LOCAL-00022" summary="update codes">
<created>1588522705925</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1588522705925</updated>
</task>
<option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -322,33 +348,35 @@
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="806" y="1321" key="#com.intellij.execution.impl.EditConfigurationsDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587721119316" />
<state x="936" y="1465" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1587721869266">
<screen x="246" y="1080" width="1920" height="1151" />
<state x="690" y="400" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1588522985742">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="690" y="400" key="#com.intellij.fileTypes.FileTypeChooser/0.22.1920.1129@0.22.1920.1129" timestamp="1588522985742" />
<state x="936" y="1465" key="#com.intellij.fileTypes.FileTypeChooser/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587721869266" />
<state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog" timestamp="1587720303076">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720303076" />
<state x="554" y="186" key="CommitChangelistDialog2" timestamp="1588232534973">
<screen x="0" y="22" width="1920" height="1058" />
<state x="554" y="197" key="CommitChangelistDialog2" timestamp="1588522705736">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129@0.22.1920.1129" timestamp="1587891829124" />
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522705736" />
<state x="554" y="186" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232534973" />
<state x="800" y="1258" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900238196" />
<state x="1038" y="1373" key="RollbackChangesDialog" timestamp="1587898773703">
<screen x="246" y="1080" width="1920" height="1151" />
<state x="792" y="309" key="RollbackChangesDialog" timestamp="1588521468770">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="792" y="309" key="RollbackChangesDialog/0.22.1920.1129@0.22.1920.1129" timestamp="1588521468770" />
<state x="1038" y="1373" key="RollbackChangesDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587898773703" />
<state x="448" y="176" key="SettingsEditor" timestamp="1588346857662">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="448" y="176" key="SettingsEditor/0.22.1920.1129@0.22.1920.1129" timestamp="1588346857662" />
<state x="694" y="1237" key="SettingsEditor/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720319782" />
<state x="560" y="312" key="Vcs.Push.Dialog.v2" timestamp="1588232541898">
<screen x="0" y="22" width="1920" height="1058" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2" timestamp="1588522707302">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129@0.22.1920.1129" timestamp="1587891830625" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522707302" />
<state x="560" y="312" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232541898" />
<state x="806" y="1395" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900239771" />
<state x="578" y="257" key="search.everywhere.popup" timestamp="1588231057499">
......
conf/en-cn.properties
View file @ 1f2d1fb0
demo=示例程序-demo
demo_bak=示例程序-demo_bak
demo_param=带参数的示例程序
meigou-detail-page-dispense-pv=美购详情页分发pv
meigou-detail-page-dispense-uv=美购详情页分发uv
meigou-detail-page-source-pv=美购详情页来源pv
meigou-detail-page-source-uv=美购详情页来源uv
jobs/meigou-detail-page/step1_1.job 0 → 100644
View file @ 1f2d1fb0
#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/meigou-detail-page/step1_2.job 0 → 100644
View file @ 1f2d1fb0
#step1_2.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/meigou-detail-page/step1_3.job 0 → 100644
View file @ 1f2d1fb0
#step1_4.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/meigou-detail-page/step1_4.job 0 → 100644
View file @ 1f2d1fb0
#step1_4.job
type=command
command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_hospital_spam_pv_day
\ No newline at end of file
jobs/meigou-detail-page/step2.job 0 → 100644
View file @ 1f2d1fb0
#step2.job
type=command
dependencies=step1_1,step1_2,step1_3,step1_4
command=curl -X GET http://localhost:8553/api/report/sendEmail/zhaojianwei@igengmei.com/jianweizhao@yeah.net/meigou-detail-page
\ No newline at end of file
lib/java/bi-report-service/.idea/workspace.xml
View file @ 1f2d1fb0
......@@ -2,7 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add">
<change afterPath="$PROJECT_DIR$/../../../sbin/test.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/meigou-detail-page.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/step1_1.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/step1_3.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/step1_4.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/step2.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../sqls/meigou-detail-page/meigou-detail-page-dispense-pv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../sqls/meigou-detail-page/meigou-detail-page-dispense-uv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../sqls/meigou-detail-page/meigou-detail-page-source-pv.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../sqls/meigou-detail-page/meigou-detail-page-source-uv.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../../../conf/en-cn.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/meigou-detail-page/step1_2.job" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -218,7 +228,7 @@
<workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="28557000" />
<workItem from="1588344252163" duration="5720000" />
<workItem from="1588344252163" duration="6866000" />
</task>
<servers />
</component>
......
sqls/meigou-detail-page/meigou-detail-page-dispense-pv.sql 0 → 100644
View file @ 1f2d1fb0
This diff is collapsed.
sqls/meigou-detail-page/meigou-detail-page-dispense-uv.sql 0 → 100644
View file @ 1f2d1fb0
This diff is collapsed.
sqls/meigou-detail-page/meigou-detail-page-source-pv.sql 0 → 100644
View file @ 1f2d1fb0
This diff is collapsed.
sqls/meigou-detail-page/meigou-detail-page-source-uv.sql 0 → 100644
View file @ 1f2d1fb0
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment