Merge branch 'master' of http://gogsb.soaringnova.com/sxwl_DL/datax-admin

app/core/airflow/templates/transform_datax.py.jinja2

@@ -8,7 +8,7 @@ print("{{ prev_execution_date_success }}")
 ' }}
 
 {{ '
-{% if prev_execution_date_success is defined %}
+{% if prev_execution_date_success != None %}
 last_time = {{  prev_execution_date_success.timestamp() }}
 {% else %}
 last_time = None

app/routers/run.py

@@ -174,6 +174,7 @@ def get_airflow_dagrun_running_status(job_id: int, af_run_id: str, db: Session =
         }
         # print(f"{task['task_id']}:{task['duration']}")
 
+
     # item = schemas.AirflowRunUpdate(**{#"start_time": item.data["start_time"],
     #                                    #"job_id": int(job_id),
     #                                    # "run_ts": item.data['run_ts'],

development.ini

@@ -46,4 +46,4 @@ uris=thrift://192.168.199.27:9083
 datax=SXKJ:32775/pod_datax:0.9
 python=SXKJ:32775/pod_python:1.1
 java=SXKJ:32775/java:1.0
-sparks=SXKJ:32775/jupyter:0.98
+sparks=SXKJ:32775/jupyter:0.981