--

lastcommit.txt

@@ -1 +1 @@
-83607de4be0a6c7a8911c51bd4878e2190dd90d9
+52981e4a0e78be01e1306419c16693b82816518f

main.py

@@ -1,5 +1,5 @@
 # This is a sample Python script.
-
+import json
 # Press <no shortcut> to execute it or replace it with your code.
 # Press Double ⇧ to search everywhere for classes, files, tool windows, actions, and settings.
 
@@ -148,21 +148,24 @@ def do():
         write_last_commit_ver(last_commits[0])
 
         # 执行jenkins远程部署
-        logger.log("本次要发布的服务:", svc_set)
+        if svc_set:
-        deploy_svcs(svc_set)
+            logger.info("本次要发布的服务:" + str(svc_set))
+        else:
+            logger.info('本次没有服务可以发布')
+        # deploy_svcs(svc_set)
 
 
     finally:
         stream.close()
 
 
-# if __name__ == '__main__':
+if __name__ == '__main__':
-#     do()
-
-@app.route(rule='/on-dev-push', methods=['GET'])
-def on_dev_push():
     do()
-    return "success"
 
-
+# @app.route(rule='/on-dev-push', methods=['GET'])
-app.run(host="0.0.0.0", port=7998, debug=False)  # 多线程模式
+# def on_dev_push():
+#     do()
+#     return "success"
+#
+#
+# app.run(host="0.0.0.0", port=7998, debug=False)  # 多线程模式

requirements.txt

@@ -0,0 +1,2 @@
+requests
+flask

test.py

@@ -1,13 +1,11 @@
 import re, os
 from log_conf import logger
 
-# 项目绝对路径
+users = set()
-git_project_env = os.environ.get('JWHT_GIT_PROJECT_DIR')
+# users.add('x')
-git_project_dir = git_project_env if git_project_env else "epmet-saas"
 
-# 上一次提交记录文件
+if users:
-last_deploy_commit_record = os.environ.get('JWHT_LAST_DEPLOY_COMMIT_RECORD')
+    print('1')
-commit_record_file_path = last_deploy_commit_record if last_deploy_commit_record else "./lastcommit.txt"
+else:
-
+    print('0')
-logger.error(git_project_dir)
+    本次没有服务可以发布
-logger.info(commit_record_file_path)