Commit a31bded4 authored by 赵建伟's avatar 赵建伟

update codes

parent 83c0e278
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/sqls/demo_spark_param/demo_spark_param.sql" dialect="SQL92" />
<file url="file://$PROJECT_DIR$/sqls/bak/demo_spark_param/demo_spark_param.sql" dialect="SQL92" />
</component>
</project>
\ No newline at end of file
......@@ -2,34 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/jobs/demo_hive/step2.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/demo_spark_param/demo_param.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sqls/demo_hive/demo_hive.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo/demo.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo/step1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_hive/step1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo/step2.job" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/demo.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_3.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_4.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_5.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_5.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_6.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/demo_param/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/report_service.zip" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/report_service.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_3.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_4.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/report_service/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/shell/hive2csv.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/hive2csv.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/shell/hive2hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/hive2hive.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/shell/sparksql2email.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/sparksql2email.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_java/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/demo/demo_bak.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_java/demo_bak.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/demo_param/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/bak/demo_param.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/shell/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/bak/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/shell/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_spark_param/demo_spark_param.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jobs/demo_hive/demo_hive.zip" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -152,7 +125,7 @@
<workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="7993000" />
<workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="11641000" />
<workItem from="1588344251422" duration="12647000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
......
......@@ -2,34 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add">
<change afterPath="$PROJECT_DIR$/../../../jobs/demo_hive/step2.job" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/demo_param.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../sqls/demo_hive/demo_hive.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo/demo.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo/step1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_hive/step1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo/step2.job" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/demo.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_3.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_4.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_5.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_5.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_6.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/report_service.zip" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/report_service.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_1.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_3.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_4.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step2.job" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../shell/hive2csv.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2csv.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../shell/hive2hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2hive.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../shell/sparksql2email.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/sparksql2email.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_java/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo_bak.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_java/demo_bak.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo_param/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/bak/demo_param.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/shell/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/bak/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/shell/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_spark_param/demo_spark_param.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../../jobs/demo_hive/demo_hive.zip" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......
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