feature:

1，修改阿里云邮件推送代码
2，增加后台推送信息显示

Ansjer/urls.py

@@ -4,7 +4,7 @@ from django.urls import path, re_path
 from Controller import FeedBackInfo, EquipmentOTA, EquipmentInfo, EquipmentSensor, StreamMedia, AdminManage, AppInfo, \
     AccessLog, Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, \
     EquipmentManager, LogManager, PermissionManager, OTAEquipment, shareUserPermission, UserManger, CheckUserData, \
-    UserController, CloudVod, OrderContrller, VodBucket, DetectController
+    UserController, CloudVod, OrderContrller, VodBucket, DetectController,DeviceShare
 
 urlpatterns = [
     url(r'^account/authcode$', UserController.authCodeView.as_view()),
@@ -108,6 +108,7 @@ urlpatterns = [
     url(r'^vodBucket/(?P<operation>.*)$', VodBucket.VodBucketView.as_view()),
     url(r'^UIDBucket/(?P<operation>.*)$', VodBucket.UidBucketView.as_view()),
     url(r'^EquipmentVersion/(?P<operation>.*)$', EquipmentOTA.EquipmentVersionView.as_view()),
+    url(r'^deviceShare/(?P<operation>.*)$', DeviceShare.DeviceShareView.as_view()),
     # 新的设备接口
     path('Test', Test.Test.as_view()),
     # 路由加参数参考

Controller/CloudVod.py

@@ -236,9 +236,13 @@ class CloudVodView(View):
             order_string = alipay.api_alipay_trade_wap_pay(
                 out_trade_no=orderID,
                 total_amount=price,
-                subject="实用性充气式玩具",
+                subject="测试哟",
+                # subject="实用性充气式玩具",
                 return_url="https://test.dvema.com/cloudVod/payOK",
-                notify_url="https://test.dvema.com/cloudVod/aliPayCallback")
+                notify_url="https://test.dvema.com/cloudVod/aliPayCallback"
+                # return_url="http://192.168.136.40/cloudVod/payOK",
+                # notify_url="http://192.168.136.40/cloudVod/aliPayCallback"
+            )
             # order_string = alipay.api_alipay_trade_page_pay(
             #     out_trade_no=orderID,
             #     total_amount=price,

Controller/shareUserPermission.py

@@ -339,3 +339,4 @@ class unsharedUserEquipmentView(View):
                         return response.json(173, {'removeCount': removeCount, 'error_UID': errorUID})
                     else:
                         return response.json(0, {'removeCount': removeCount})
+