From 328307213763faa19d0874b345ba7e354e46b200 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 16:55:54 +0800 Subject: [PATCH 01/15] face login --- hb_server/apps/hrm/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index bd2f6b4..1bd355c 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -30,7 +30,7 @@ class HRMService: update_all_user_facedata_cache() try: results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.5) + unknown_face_encoding, tolerance=0.55) except: return None, '人脸匹配失败' for index, value in enumerate(results): From 85345f572dd26dcdea1633cbae93fb4e62243b86 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 17:00:52 +0800 Subject: [PATCH 02/15] face login --- hb_server/apps/hrm/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index 1bd355c..d95839d 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -30,7 +30,7 @@ class HRMService: update_all_user_facedata_cache() try: results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.55) + unknown_face_encoding, tolerance=0.52) except: return None, '人脸匹配失败' for index, value in enumerate(results): From 54d4bca2ea6c518b742f4d358b470e59cf9a70ec Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 17:10:11 +0800 Subject: [PATCH 03/15] face login --- hb_server/apps/hrm/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index d95839d..f2101f6 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -30,7 +30,7 @@ class HRMService: update_all_user_facedata_cache() try: results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.52) + unknown_face_encoding, tolerance=0.49) except: return None, '人脸匹配失败' for index, value in enumerate(results): From b61212980b930922fcbb375d06884a4ad0b8a68b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 20:40:56 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=BA=E8=84=B8?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/services.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index f2101f6..1abfb19 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -17,36 +17,37 @@ class HRMService: f.write(base64_data) try: unknown_picture = face_recognition.load_image_file(filepath) - unknown_face_encoding = face_recognition.face_encodings(unknown_picture)[0] + unknown_face_encoding = face_recognition.face_encodings(unknown_picture, num_jitters=3)[0] os.remove(filepath) except: os.remove(filepath) - return None, '人脸识别失败' + return None, '识别失败,请调整位置' # 匹配人脸库 face_datas = cache.get('face_datas') - face_users = cache.get('face_users') if face_datas is None: update_all_user_facedata_cache() + face_datas = cache.get('face_datas') + face_users = cache.get('face_users') try: results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.49) + unknown_face_encoding, tolerance=0.4) except: - return None, '人脸匹配失败' + return None, '人脸未匹配' for index, value in enumerate(results): if value: # 识别成功 user = User.objects.get(id=face_users[index]) return user, '' - return None, '人脸匹配失败' + return None, '人脸未匹配' @classmethod def get_facedata_from_img(cls, img_path): try: photo_path = settings.BASE_DIR + img_path picture_of_me = face_recognition.load_image_file(photo_path) - my_face_encoding = face_recognition.face_encodings(picture_of_me)[0] + my_face_encoding = face_recognition.face_encodings(picture_of_me, num_jitters=10)[0] face_data_list = my_face_encoding.tolist() return face_data_list, '' except: - return None, '人脸识别失败' \ No newline at end of file + return None, '人脸数据获取失败请重新上传图片' \ No newline at end of file From 62ca3cefbd5c4c539274bd2af354e03151a28f7d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 20:59:40 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/services.py | 8 ++++---- hb_server/server/urls.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index 1abfb19..9a15522 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -31,22 +31,22 @@ class HRMService: face_users = cache.get('face_users') try: results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.4) + unknown_face_encoding, tolerance=0.45) except: - return None, '人脸未匹配' + return None, '人脸未匹配1' for index, value in enumerate(results): if value: # 识别成功 user = User.objects.get(id=face_users[index]) return user, '' - return None, '人脸未匹配' + return None, '人脸未匹配2' @classmethod def get_facedata_from_img(cls, img_path): try: photo_path = settings.BASE_DIR + img_path picture_of_me = face_recognition.load_image_file(photo_path) - my_face_encoding = face_recognition.face_encodings(picture_of_me, num_jitters=10)[0] + my_face_encoding = face_recognition.face_encodings(picture_of_me)[0] face_data_list = my_face_encoding.tolist() return face_data_list, '' except: diff --git a/hb_server/server/urls.py b/hb_server/server/urls.py index 7776b06..0ed07c3 100644 --- a/hb_server/server/urls.py +++ b/hb_server/server/urls.py @@ -25,21 +25,25 @@ from rest_framework import routers from rest_framework.documentation import include_docs_urls from django.views.generic import TemplateView from utils.view import GenSignature, UpdateDevelop - +import os router = routers.DefaultRouter() router.register('', FileViewSet, basename="file") -schema_view = get_schema_view( - openapi.Info( +schema_dict = dict( + info=openapi.Info( title="航玻ERP API", default_version='v1', contact=openapi.Contact(email="caoqianming@foxmail.com"), license=openapi.License(name="MIT License"), ), public=True, - permission_classes=[], - url="http://49.232.14.174:2222/" -) + permission_classes=[],) + +if os.getenv('DJANGO_SETTINGS_MODULE') != 'server.settings_dev': + schema_dict['url'] = "http://49.232.14.174:2222/" + +schema_view = get_schema_view(**schema_dict) + urlpatterns = [ path('api/admin/doc/', include('django.contrib.admindocs.urls')), From 1be0ec0fd866f16430d20d1c2e609247b2f6f4c9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 23:07:24 +0800 Subject: [PATCH 06/15] face tiaozheng --- hb_server/apps/hrm/services.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index 9a15522..60c8023 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -17,7 +17,7 @@ class HRMService: f.write(base64_data) try: unknown_picture = face_recognition.load_image_file(filepath) - unknown_face_encoding = face_recognition.face_encodings(unknown_picture, num_jitters=3)[0] + unknown_face_encoding = face_recognition.face_encodings(unknown_picture, num_jitters=2)[0] os.remove(filepath) except: os.remove(filepath) @@ -29,24 +29,21 @@ class HRMService: update_all_user_facedata_cache() face_datas = cache.get('face_datas') face_users = cache.get('face_users') - try: - results = face_recognition.compare_faces(face_datas, - unknown_face_encoding, tolerance=0.45) - except: - return None, '人脸未匹配1' + results = face_recognition.compare_faces(face_datas, + unknown_face_encoding, tolerance=0.45) for index, value in enumerate(results): if value: # 识别成功 user = User.objects.get(id=face_users[index]) return user, '' - return None, '人脸未匹配2' + return None, '人脸未匹配' @classmethod def get_facedata_from_img(cls, img_path): try: photo_path = settings.BASE_DIR + img_path picture_of_me = face_recognition.load_image_file(photo_path) - my_face_encoding = face_recognition.face_encodings(picture_of_me)[0] + my_face_encoding = face_recognition.face_encodings(picture_of_me, num_jitters=2)[0] face_data_list = my_face_encoding.tolist() return face_data_list, '' except: From 2f5d67273601546ecf269aa85289600b977ea8a0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Feb 2022 23:13:53 +0800 Subject: [PATCH 07/15] =?UTF-8?q?facelogin=20=E8=BF=94=E5=9B=9Ename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/services.py | 2 +- hb_server/apps/hrm/views.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index 60c8023..eca4639 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -36,7 +36,7 @@ class HRMService: # 识别成功 user = User.objects.get(id=face_users[index]) return user, '' - return None, '人脸未匹配' + return None, '人脸未匹配,请调整位置' @classmethod def get_facedata_from_img(cls, img_path): diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 575f324..c9121b0 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -183,6 +183,7 @@ class FaceLogin(CreateAPIView): return Response({ 'refresh': str(refresh), 'access': str(refresh.access_token), - 'username':user.username + 'username':user.username, + 'name':user.name }) return Response(msg, status=status.HTTP_400_BAD_REQUEST) \ No newline at end of file From cee38849ddb40f1b0b6cdabe78469ca7b84cafef Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 08:39:48 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=B0=83=E6=95=B4defaultpermission=20cla?= =?UTF-8?q?ss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/server/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index 1a4a5c6..d0fdffa 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -158,7 +158,7 @@ REST_FRAMEWORK = { 'rest_framework.authentication.SessionAuthentication', ], 'DEFAULT_PERMISSION_CLASSES': [ - # 'rest_framework.permissions.IsAuthenticated', + 'rest_framework.permissions.AllowAny', 'apps.system.permission.RbacPermission' ], 'DEFAULT_RENDERER_CLASSES': [ From e0b14846f0a723f5a738aaa5052c9f8bea583647 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:10:34 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/inm/services.py | 25 ++++++++----------- .../apps/sam/migrations/0015_sale_ship_pic.py | 18 +++++++++++++ hb_server/apps/sam/models.py | 1 + hb_server/apps/sam/serializers_sale.py | 3 +++ hb_server/apps/sam/views_sale.py | 15 ++++++++--- hb_server/utils/view.py | 14 +++++------ 6 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 hb_server/apps/sam/migrations/0015_sale_ship_pic.py diff --git a/hb_server/apps/inm/services.py b/hb_server/apps/inm/services.py index b9df308..aac1d34 100644 --- a/hb_server/apps/inm/services.py +++ b/hb_server/apps/inm/services.py @@ -55,23 +55,18 @@ class InmService: for i in FIFOItem.objects.filter(fifo=instance): material = i.material warehouse = i.warehouse - o1 = Inventory.objects.get(material=material, warehouse=warehouse) - temp_count = o1.count - i.count - if temp_count < 0: - raise ValidationError('仓库库存不足,操作失败') - o1.count = temp_count - o1.save() - print(i.batch) - o2 = MaterialBatch.objects.get(material=material, warehouse=warehouse, batch=i.batch) - temp_count = o2.count - i.count + mb = MaterialBatch.objects.get(material=material, warehouse=warehouse, batch=i.batch) + temp_count = mb.count - i.count if temp_count < 0: raise ValidationError('批次库存不足,操作失败') - o2.count = temp_count - o2.save() - temp_count = material.count - i.count - if temp_count < 0: - raise ValidationError('物料库存不足,操作失败') - material.count = temp_count + mb.count = temp_count + mb.save() + + iv = Inventory.objects.get(material=material, warehouse=warehouse) + iv.count = MaterialBatch.objects.filter(material=material, warehouse=warehouse).count() + iv.save() + + material.count = MaterialBatch.objects.filter(material=material).count() material.save() # 删除IProduct diff --git a/hb_server/apps/sam/migrations/0015_sale_ship_pic.py b/hb_server/apps/sam/migrations/0015_sale_ship_pic.py new file mode 100644 index 0000000..5b18d28 --- /dev/null +++ b/hb_server/apps/sam/migrations/0015_sale_ship_pic.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-02-25 01:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sam', '0014_auto_20220222_1530'), + ] + + operations = [ + migrations.AddField( + model_name='sale', + name='ship_pic', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='物流图片'), + ), + ] diff --git a/hb_server/apps/sam/models.py b/hb_server/apps/sam/models.py index 0477da0..ba9a809 100644 --- a/hb_server/apps/sam/models.py +++ b/hb_server/apps/sam/models.py @@ -93,6 +93,7 @@ class Sale(CommonADModel): receiver_phone = models.CharField('收货人联系电话', null=True, blank=True, max_length=20) receiver_address = models.CharField('收获地址', null=True, blank=True, max_length=200) remark = models.CharField('备注', null=True, blank=True, max_length=200) + ship_pic = models.CharField('物流图片', max_length=200, null=True, blank=True) class SaleProduct(BaseModel): """ diff --git a/hb_server/apps/sam/serializers_sale.py b/hb_server/apps/sam/serializers_sale.py index 4fb7589..e9347c0 100644 --- a/hb_server/apps/sam/serializers_sale.py +++ b/hb_server/apps/sam/serializers_sale.py @@ -97,3 +97,6 @@ class SaleProductPackSerializer(serializers.ModelSerializer): class SRemarkItemCreateSerializer(serializers.Serializer): remark = serializers.CharField(min_length=6) + +class SaleUpShipPicSerializer(serializers.Serializer): + path = serializers.CharField(min_length=200) diff --git a/hb_server/apps/sam/views_sale.py b/hb_server/apps/sam/views_sale.py index a97b37f..9135fe1 100644 --- a/hb_server/apps/sam/views_sale.py +++ b/hb_server/apps/sam/views_sale.py @@ -6,7 +6,7 @@ from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse from apps.inm.services import InmService from apps.mtm.models import Material, PackItem from apps.sam.models import Sale, SalePack, SaleProduct -from apps.sam.serializers_sale import SRemarkItemCreateSerializer, SaleCreateSerializer, SaleListSerializer, SaleProductCreateSerializer, SaleProductListSerializer, SaleProductPackDetailSerializer, SaleProductPackSerializer +from apps.sam.serializers_sale import SRemarkItemCreateSerializer, SaleCreateSerializer, SaleListSerializer, SaleProductCreateSerializer, SaleProductListSerializer, SaleProductPackDetailSerializer, SaleProductPackSerializer, SaleUpShipPicSerializer from rest_framework import exceptions from django.db import transaction from rest_framework.decorators import action @@ -85,8 +85,6 @@ class SaleViewSet(CreateUpdateModelAMixin, ListModelMixin, RetrieveModelMixin, C fifo.sale = obj fifo.type = FIFO.FIFO_TYPE_SALE_OUT fifo.is_audited = False - fifo.auditor = request.user - fifo.inout_date = timezone.now() fifo.create_by = request.user fifo.number = 'CK' + ranstr(7) fifo.save() @@ -95,6 +93,17 @@ class SaleViewSet(CreateUpdateModelAMixin, ListModelMixin, RetrieveModelMixin, C obj.save() return Response() + + @action(methods=['post'], detail=True, perms_map={'post':'sale_up_ship'}, serializer_class=SaleUpShipPicSerializer) + @transaction.atomic + def up_ship(self, request, pk=None): + """ + 上传物流信息 + """ + obj = self.get_object() + obj.ship_pic = request.data['path'] + obj.save() + return Response() diff --git a/hb_server/utils/view.py b/hb_server/utils/view.py index 30bc9be..08aad2e 100644 --- a/hb_server/utils/view.py +++ b/hb_server/utils/view.py @@ -78,15 +78,15 @@ class UpdateDevelop(APIView): def post(self, request, *args, **kwargs): import os # 更新后端 - os.chdir('/home/hberp') + os.chdir('/home/lighthouse/hberp') ret = os.popen('git pull https://caoqianming%40foxmail.com:9093qqww@e.coding.net/ctcdevteam/hberp/hberp.git develop') # 奇怪的处理 - os.chdir('/home/hberp/hb_server/vuedist') - os.popen('cp index.html indexbak') - time.sleep(1000) - os.popen('rm -rf index.html') - time.sleep(1000) - os.popen('mv -f indexbak index.html') + # os.chdir('/home/hberp/hb_server/vuedist') + # os.popen('cp index.html indexbak') + # time.sleep(1000) + # os.popen('rm -rf index.html') + # time.sleep(1000) + # os.popen('mv -f indexbak index.html') # 打包前端 # os.chdir('/home/hberp/hb_client') # os.system('npm run build:prod') From 5dd7089daecc4fa3f8fc5a6fe26fac000c20fee4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:27:22 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/utils/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/utils/view.py b/hb_server/utils/view.py index 08aad2e..e38df8b 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('git pull https://caoqianming%40foxmail.com:9093qqww@e.coding.net/ctcdevteam/hberp/hberp.git develop') + ret = os.popen('bash server_reload.sh') # 奇怪的处理 # os.chdir('/home/hberp/hb_server/vuedist') # os.popen('cp index.html indexbak') From 7c9745533543af5e39ba55614f122d80cdb377f6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:31:36 +0800 Subject: [PATCH 11/15] server reload sh --- hb_client/.env.production | 2 +- server_reload.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 server_reload.sh diff --git a/hb_client/.env.production b/hb_client/.env.production index d214255..a6efc10 100644 --- a/hb_client/.env.production +++ b/hb_client/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' +VUE_APP_BASE_API = 'http://49.232.14.174:2222/api' #VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' diff --git a/server_reload.sh b/server_reload.sh new file mode 100644 index 0000000..7fc8a0f --- /dev/null +++ b/server_reload.sh @@ -0,0 +1,4 @@ +#!/bin/bash +cd /home/lighthouse/hberp +exec sudo git pull +exec sudo service supervisor reload \ No newline at end of file From ff58a631c1cd4811553acc1cea4630fb975cd413 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:38:18 +0800 Subject: [PATCH 12/15] =?UTF-8?q?reload.sh=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server_reload.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server_reload.sh b/server_reload.sh index 7fc8a0f..a812cd4 100644 --- a/server_reload.sh +++ b/server_reload.sh @@ -1,4 +1,3 @@ #!/bin/bash cd /home/lighthouse/hberp -exec sudo git pull -exec sudo service supervisor reload \ No newline at end of file +exec sudo git pull && sudo service supervisor reload \ No newline at end of file From 830cf6f6a2f3f9850ac21067f6104bb21a064c38 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:45:33 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server_reload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_reload.sh b/server_reload.sh index a812cd4..390afb4 100644 --- a/server_reload.sh +++ b/server_reload.sh @@ -1,3 +1,3 @@ #!/bin/bash cd /home/lighthouse/hberp -exec sudo git pull && sudo service supervisor reload \ No newline at end of file +sudo git pull && sudo service supervisor reload \ No newline at end of file From 1d86d9b2a4135c8bfeac829a048ba2608e4d3d13 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 09:51:59 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=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 From dd51db56f183cfdad24388433cd1a23ebbea6f0f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 25 Feb 2022 10:02:46 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/sam/serializers_sale.py | 2 +- hb_server/apps/sam/views_sale.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/sam/serializers_sale.py b/hb_server/apps/sam/serializers_sale.py index e9347c0..256faa1 100644 --- a/hb_server/apps/sam/serializers_sale.py +++ b/hb_server/apps/sam/serializers_sale.py @@ -99,4 +99,4 @@ class SRemarkItemCreateSerializer(serializers.Serializer): remark = serializers.CharField(min_length=6) class SaleUpShipPicSerializer(serializers.Serializer): - path = serializers.CharField(min_length=200) + path = serializers.CharField(min_length=4, max_length=200) diff --git a/hb_server/apps/sam/views_sale.py b/hb_server/apps/sam/views_sale.py index 0daa4d9..ed18874 100644 --- a/hb_server/apps/sam/views_sale.py +++ b/hb_server/apps/sam/views_sale.py @@ -100,8 +100,11 @@ class SaleViewSet(CreateUpdateModelAMixin, ListModelMixin, RetrieveModelMixin, C """ 上传物流信息 """ + serializer = SaleUpShipPicSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + vdata = serializer.validated_data obj = self.get_object() - obj.ship_pic = request.data.get('path', None) + obj.ship_pic = vdata['path'] obj.save() return Response()