chenjunkai 6 gadi atpakaļ
vecāks
revīzija
caff34d45c
3 mainītis faili ar 50 papildinājumiem un 1 dzēšanām
  1. 4 0
      controller/LangWord.py
  2. 42 0
      controller/WebHook.py
  3. 4 1
      langer/urls.py

+ 4 - 0
controller/LangWord.py

@@ -136,6 +136,10 @@ class LangWordView(TemplateView):
         line = int(request_dict.get('line', None))
         searchKey = request_dict.get('searchKey', None)
         searchVal = request_dict.get('searchVal', None)
+        if searchKey:
+            searchKey = searchKey.strip()
+        if searchVal:
+            searchKey = searchKey.strip()
         orderByupdate = request_dict.get('orderByupdate', 0)
         if page and line:
             lang_set_list = LangSetModel.objects.filter(user__id=userID).values_list('lang__id', flat=True)

+ 42 - 0
controller/WebHook.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3  
+# -*- coding: utf-8 -*-  
+"""
+@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
+@AUTHOR: ASJRD018
+@NAME: langer
+@software: PyCharm
+@DATE: 2019/7/15 15:16
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: WebHook.py
+@Contact: chanjunkai@163.com
+"""
+import json
+import os
+from django.http import HttpResponse
+from django.views.generic import TemplateView
+
+from object.ResponseObject import ResponseObject
+
+
+class WebHookView(TemplateView):
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation', None)
+        request_dict = json.loads(request.body.decode('utf-8'))
+        return self.validate(request_dict, operation)
+
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        request_dict = request.GET
+        operation = kwargs.get('operation', None)
+        return self.validate(request_dict, operation)
+
+    def validate(self, request_dict, operation):
+        response = ResponseObject()
+        item = request_dict.get('item', None)
+        if item == 'alexaOA':
+            os.system("cd /web/amazon-alexa-camera;git pull")
+            return response.json(0)
+        else:
+            return HttpResponse(status=404)

+ 4 - 1
langer/urls.py

@@ -12,5 +12,8 @@ urlpatterns = [
     re_path('langSet/(?P<operation>.*)', LangSet.LangSetView.as_view()),
     re_path('langWord/(?P<operation>.*)', LangWord.LangWordView.as_view()),
     re_path('langArea/(?P<operation>.*)', LangArea.LangAreaView.as_view()),
-    path('exportLang',LangArea.exportLangView.as_view())
+    path('exportLang',LangArea.exportLangView.as_view()),
+    # 47 hook
+    path('webHook', LangArea.exportLangView.as_view()),
+
 ]