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

Makefile

@@ -39,4 +39,7 @@ txtest:
 
 txprod:
 	@docker build --target image-txprod -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):txprod .
-	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):txprod
+	@docker push registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):txprod
+
+rsync:
+	@rsync -azP --exclude ".*/"  --exclude "tmp/" `pwd` sxkj@192.168.199.109:/home/sxkj/zhangli/datax-admin-inte

app/core/airflow/task.py

@@ -112,7 +112,7 @@ class SparksTaskCompiler(TaskCompiler):
                       "executor-memory": "1g",
                       "executor-cores": 1,
                       "num-executors": 1,
-                      "archives": "/workspace/py37.zip#python3env"
+                      "archives": f"{self.task.envs.get('requirement_package_path','/workspace/py37.zip')}#python3env"
                       }
         spark_config = {'spark.default.parallelism': 1,
                         "spark.executor.memoryOverhead": "1g",