From 1d86d9b2a4135c8bfeac829a048ba2608e4d3d13 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 25 Feb 2022 09:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=A9=E6=B5=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/sam/views_sale.py | 2 +-
 hb_server/utils/view.py          | 2 +-
 server_reload.sh                 | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 server_reload.sh

diff --git a/hb_server/apps/sam/views_sale.py b/hb_server/apps/sam/views_sale.py
index 9135fe1..0daa4d9 100644
--- a/hb_server/apps/sam/views_sale.py
+++ b/hb_server/apps/sam/views_sale.py
@@ -101,7 +101,7 @@ class SaleViewSet(CreateUpdateModelAMixin, ListModelMixin, RetrieveModelMixin, C
         上传物流信息
         """
         obj = self.get_object()
-        obj.ship_pic = request.data['path']
+        obj.ship_pic = request.data.get('path', None)
         obj.save()
         return Response()
 
diff --git a/hb_server/utils/view.py b/hb_server/utils/view.py
index e38df8b..be860d6 100644
--- a/hb_server/utils/view.py
+++ b/hb_server/utils/view.py
@@ -79,7 +79,7 @@ class UpdateDevelop(APIView):
         import os
         # 更新后端
         os.chdir('/home/lighthouse/hberp')
-        ret = os.popen('bash server_reload.sh')
+        ret = os.popen('sudo git pull && sudo service supervisor reload')
         # 奇怪的处理
         # os.chdir('/home/hberp/hb_server/vuedist')
         # os.popen('cp index.html indexbak')
diff --git a/server_reload.sh b/server_reload.sh
deleted file mode 100644
index 390afb4..0000000
--- a/server_reload.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /home/lighthouse/hberp
-sudo git pull && sudo service supervisor reload
\ No newline at end of file