删除注释

Ansjer/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import url
 from django.contrib import admin
-from django.urls import path, re_path
+from django.urls import include
+from django.urls import re_path
 
 from AdminController import UserManageController, RoleController, MenuController, TestServeController, \
     ServeManagementController, LogManagementController, DeviceManagementController, VersionManagementController, \
@@ -25,10 +25,8 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     DeviceLogController, CouponController, AiController, ShadowController, SuperPasswordTool
 from Controller.Cron import CronTaskController
 from Controller.MessagePush import EquipmentMessagePush
-from Controller.Surveys import CloudStorageController
 from Controller.SensorGateway import SensorGatewayController, EquipmentFamilyController
-from django.urls import include
-
+from Controller.Surveys import CloudStorageController
 from Controller.UserDevice import UserDeviceShareController
 
 urlpatterns = [
@@ -65,24 +63,19 @@ urlpatterns = [
     re_path(r'^equipment/modifyUserEquipment$', EquipmentManager.modifyUserEquipmentInterface),
     re_path(r'^equipment/showAllUserEquipment$', EquipmentManager.showAllUserEquipmentInterface),
     re_path(r'^equipment/findEquipmentInfo$', EquipmentManager.findEquipmentInfoInterface),
-    # 新删除设备接口
     re_path(r'^equipment/delete', EquipmentManager.deleteInterface),
     re_path(r'^equipment/batchDelete', EquipmentManager.batchDeleteInterface),
     re_path(r'^equipment/add', EquipmentManager.addInterface),
     re_path(r'^equipment/admin_add', EquipmentManager.admin_addInterface),
     re_path(r'^equipment/admin_modify', EquipmentManager.admin_modifyInterface),
-
     re_path(r'^equipment/query', EquipmentManager.queryInterface),
-    # 获取设备影子信息接口
     re_path(r'^equipment/flow$', EquipmentManager.uid_status),
-
     re_path(r'^OTA/uploads$', OTAEquipment.getUploadFiletoDirView.as_view()),
     re_path(r'^OTA/download$', OTAEquipment.downloadUpdataFileUrl),
     re_path(r'^OTA/downloads/(\w+)/(\w+[\w+]*.+[^_w]*.\w+)$', OTAEquipment.downloadUpdataFileUrlInterface),
     re_path(r'^OTA/getEquipmentVersion$', OTAEquipment.getEquipmentVersionInterface),
     re_path(r'^OTA/getUpdataFileUrl$', OTAEquipment.getUpdataFileUrlInterface),
     re_path(r'^OTA/addNewEquipmentVersion$', OTAEquipment.addNewEquipmentVersionInterface),
-
     re_path(r'^roles/addNewRole$', PermissionManager.addNewRoleView.as_view()),
     re_path(r'^roles/queryRole$', PermissionManager.queryRoleView.as_view()),
     re_path(r'^roles/delRole$', PermissionManager.delRoleView.as_view()),
@@ -97,72 +90,47 @@ urlpatterns = [
     re_path(r'^downloads/upgrade/(\w+)/(\w+.[^_w]*\w+.\w+)$', OTAEquipment.downloadUpdataFileUrlInterface),
     re_path(r'^getOTAurl/getUpdataFileUrl$', OTAEquipment.getUpdataFileUrlInterface),
     re_path(r'^equipment/info', EquipmentInfo.EquipmentInfo.as_view()),
-    re_path(r'^adminManage/manage', AdminManage.AdminManage.as_view()),  # 管理员专属view
-    re_path(r'^equipment/OTA', EquipmentOTA.EquipmentOTA.as_view()),  # OTA重构类
-    re_path(r'^userbrandinfo/(?P<operation>.*)$', UserBrandController.UserBrandInfo.as_view()),  # 用户登录的手机端品牌记录统计信息表
-
+    re_path(r'^adminManage/manage', AdminManage.AdminManage.as_view()),
+    re_path(r'^equipment/OTA', EquipmentOTA.EquipmentOTA.as_view()),
+    re_path(r'^userbrandinfo/(?P<operation>.*)$', UserBrandController.UserBrandInfo.as_view()),
     re_path(r'^uidset/(?P<operation>.*)$', UidSetController.UidSetView.as_view()),
-    re_path(r'^appInfo', AppInfo.AppInfo.as_view()),  # app版本信息
-
+    re_path(r'^appInfo', AppInfo.AppInfo.as_view()),
     re_path(r'^meal/manage', MealManage.MealManage.as_view()),
     re_path(r'^device/manage$', DeviceManage.DeviceManage.as_view()),
-    # 设备在线
     re_path(r'^device/online$', EquipmentStatus.EquipmentOnline),
-    # 设备离线
     re_path(r'^device/offline$', EquipmentStatus.EquipmentOffline),
-    # 设备离线
     re_path(r'^device/updateIP$', EquipmentStatus.updateIP),
-    # 系统ctr
     re_path(r'^sys/updateLog', SysManage.updateLog),
     re_path(r'^devices/(\w+)/logs$', DeviceLog.DeviceLog),
     re_path(r'^devices/(\w+)$', DeviceManage.Devices),
-    # 访问日志 mongodb版
     re_path(r'^LogAccess$', LogAccess.LogAccess),
-    # 上传操作文档
     re_path(r'^HelpCHM/upload$', LogManager.upload_help_chm),
     re_path(r'^admin/userIDs$', AdminManage.getUserIds),
     re_path('eq/delById', EquipmentInfo.deleteExpireEquipmentInfoById),
-    # 新需求ota接口
     re_path(r'^OTA/getNewVer', OTAEquipment.getNewVerInterface),
     re_path(r'^OTA/uploadsPack$', OTAEquipment.uploadOTAInterfaceView.as_view()),
     re_path(r'^OTA/downloadsPack/(?P<fullPath>[0-9\w/.\-]+)', OTAEquipment.downloadOTAInterface),
     re_path(r'^dlotapack/(?P<fullPath>[0-9\w/.\-]+)', OTAEquipment.downloadOTAInterfaceV2),
     re_path(r'^OTA/getDownLoadOTApackUrl$', OTAEquipment.getDownLoadOTApackUrl),
     re_path(r'^OTA/checkMaxVersion$', OTAEquipment.checkMaxVersion),
-
-    # h获取验证码    # v2接口
     re_path(r'^v2/account/authcode$', UserController.v2authCodeView.as_view()),
     re_path(r'^v2/account/register$', UserController.v2registerView.as_view()),
     re_path(r'^v2/account/forgetCode$', UserController.v2forgetPwdCodeView.as_view()),
     re_path(r'^v2/account/resetPwdByCode$', UserController.v2resetPwdByCodeView.as_view()),
-
-    # 重置密码验证码校验
     re_path(r'^v2/authcode/verify$', UserController.verifyAuthcode.as_view()),
     re_path(r'^v2/account/logout$', UserController.V2LogoutView.as_view()),
     re_path(r'^v2/account/login$', UserController.v3LoginView.as_view()),
     re_path(r'^v3/account/login$', UserController.v3LoginView.as_view()),
     re_path(r'^account/oneClickLogin$', UserController.oneClickLoginView.as_view()),
     re_path(r'^account/createPwd$', UserController.createPwd.as_view()),
-
-    # 用户删除/注销
     re_path(r'^account/delete$', UserController.deleteAccount),
-
-    # 确认地区
     re_path(r'^user/confirmRegion$', UserController.confirmRegion),
-
-    # 验证码登录
     re_path(r'^account/loginCode$', UserController.loginCodeView.as_view()),
     re_path(r'^v3/account/loginByCode$', UserController.v3LoginByCodeView.as_view()),
-
-    # 指纹登录
     re_path(r'^v3/account/loginByFingerprint$', UserController.v3LoginByFingerprintView.as_view()),
     re_path(r'^v3/account/setFingerprint$', UserController.v3SetFingerprintView.as_view()),
-
-    # 推送项目接口
     re_path(r'^detect/(?P<operation>.*)$', DetectController.DetectControllerView.as_view()),
     re_path(r'^detectV2/(?P<operation>.*)$', DetectControllerV2.DetectControllerViewV2.as_view()),
-
-    # 新增
     re_path(r'^cloudVod/(?P<operation>.*)$', CloudVod.CloudVodView.as_view()),
     re_path(r'^meal/(?P<operation>.*)$', MealManage.MealView.as_view()),
     re_path(r'^order/(?P<operation>.*)$', OrderContrller.OrderView.as_view()),
@@ -170,56 +138,37 @@ urlpatterns = [
     re_path(r'^vodBucket/(?P<operation>.*)$', VodBucket.VodBucketView.as_view()),
     re_path(r'^UIDBucket/(?P<operation>.*)$', VodBucket.UidBucketView.as_view()),
     re_path(r'^EquipmentVersion/(?P<operation>.*)$', EquipmentOTA.EquipmentVersionView.as_view()),
-
     re_path(r'^deviceShare/(?P<operation>.*)$', DeviceShare.DeviceShareView.as_view()),
     re_path(r'^appVer/views$', AppInfo.AppVersionView.as_view()),
-
-    # 屏蔽
     re_path(r'^user/initInfo$', UserController.InitInfoView.as_view()),
     re_path(r'^user/information/(?P<operation>.*)$', UserController.InitUserInformationView.as_view()),
-    # 获取时区相关信息
     re_path(r'^getTZ$', EquipmentStatus.getTZ),
-
-    # oss授权
     re_path(r'^stsOss/(?P<operation>.*)$', StsOssController.StsOssView.as_view()),
-
-    # 用户反馈信息
     re_path(r'^feedback/(?P<operation>.*)$', FeedBack.FeedBackView.as_view()),
     re_path(r'^uidpreview/(?P<operation>.*)$', UIDPreview.UIDPreview.as_view()),
     re_path(r'^sysmsg/(?P<operation>.*)$', SysMsg.SysMsgView.as_view()),
     re_path(r'^sysfile/(?P<filePath>.*)$', SysManage.getStatView.as_view()),
-
     re_path(r'^equipment/flowUpdate', EquipmentManager.update_uid_set),
-
     re_path(r'^log/getUploadUrl', EquipmentStatus.getUploadLogUrl),
     re_path(r'^app/getIdData', AppInfo.AppIdDataView.as_view()),
     re_path(r'^wechat/authsign', UserController.wxAuthSignView.as_view()),
     re_path(r'^wechat/perfect', UserController.wxPerfectView.as_view()),
-    # 分区分流
     re_path('Test', Test.Test.as_view()),
-    # 微信绑定的用户获取验证码
     re_path(r'^oauth/authcode', UserController.OauthAuthCodeView.as_view()),
     re_path(r'^oauth/perfect', UserController.OauthPerfectView.as_view()),
     re_path(r'^oauth/unbunding', UserController.UnbundingWXView.as_view()),
-
     re_path(r'^equipment/judge', EquipmentManager.judgeInterface),
-
-    # ap模式，新增设备表
     re_path(r'^uiduser/add', UidUser.addInterface),
     re_path(r'^uiduser/query', UidUser.queryInterface),
     re_path(r'^uiduser/update', UidUser.updateInterface),
     re_path(r'^uiduser/delete', UidUser.deleteInterface),
     re_path(r'^uid_user/(?P<operation>.*)$', UidUser.UidUserView.as_view()),
-    # add query update delete
     re_path(r'^v2/equipment/(?P<operation>.*)$', EquipmentManagerV2.EquipmentManagerV2.as_view()),
-
     re_path(r'^msg/init', SysManage.initMsgFunc),
-
     re_path(r'^oss_crd/(?P<operation>.*)$', OssCrd.OssCrdView.as_view()),
     re_path(r'^push_deploy/(?P<operation>.*)$', PushDeploy.PushDeployView.as_view()),
     re_path(r'^oalexa/auth', UserController.alexaAuthView.as_view()),
     re_path(r'^oalexa/discoveryuid', UserController.alexaUidView.as_view()),
-
     re_path('appset/(?P<operation>.*)', AppSetController.AppSetView.as_view()),
     re_path(r'^application/(?P<operation>.*)$', ApplicationController.ApplicationView.as_view()),
     re_path(r'^login/oauth/(?P<operation>.*)$', ApplicationController.AuthView.as_view()),
@@ -227,24 +176,17 @@ urlpatterns = [
     re_path(r'^user/ex/(?P<operation>.*)$', UserExController.UserExView.as_view()),
     re_path(r'^v3/equipment/(?P<operation>.*)$', EquipmentManagerV3.EquipmentManagerV3.as_view()),
     re_path(r'^cloudstorage/(?P<operation>.*)$', CloudStorage.CloudStorageView.as_view()),
-    re_path(r'^payCycle/(?P<operation>.*)$', PaymentCycle.PaypalCycleNotify.as_view()),  # 周期扣款
-    re_path(r'^paypalCycleNotify/(?P<operation>.*)$', PaymentCycle.PaypalCycleNotify.as_view()),  # paypal周期扣款订阅通知
-    re_path(r'^paymentCycle/(?P<operation>.*)$', PaymentCycle.payCycle.as_view()),  # paypal周期扣款
-
-    # AI服务
+    re_path(r'^payCycle/(?P<operation>.*)$', PaymentCycle.PaypalCycleNotify.as_view()),
+    re_path(r'^paypalCycleNotify/(?P<operation>.*)$', PaymentCycle.PaypalCycleNotify.as_view()),
+    re_path(r'^paymentCycle/(?P<operation>.*)$', PaymentCycle.payCycle.as_view()),
     re_path(r'^AiService/(?P<operation>.*)$', AiController.AiView.as_view()),
-    # 消息提醒
     re_path(r'^app/setting/notification/(?P<operation>.*)$', EquipmentMessagePush.EquipmentMessagePushView.as_view()),
-
-    # 新增解密的接口
     re_path(r'^v3/account/changePwd$', UserController.v3ChangePwdView.as_view()),
     re_path(r'^v3/account/resetPwdByCode$', UserController.v3resetPwdByCodeView.as_view()),
     re_path(r'^v3/account/register$', UserController.v3registerView.as_view()),
     re_path(r'^v3/uiduser/add', UidUser.v3addInterface),
     re_path(r'^v3/uiduser/query', UidUser.v3queryInterface),
-    # 判断节假日接口
     re_path(r'^date/(?P<operation>.*)$', DateController.DateConView.as_view()),
-
     re_path(r'^equipment/flow_test$', EquipmentManager.uid_status_test),
     re_path(r'^account/appFrequency/(?P<operation>.*)$', UserController.UserAppFrequencyView.as_view()),
     re_path(r'^v2/userbrand/(?P<operation>.*)$', UserBrandControllerV2.UserBrandV2.as_view()),
@@ -252,54 +194,27 @@ urlpatterns = [
     re_path(r'^statistcs/appFrequencyYear$', StatisticsController.statistcsAppFrequencyYear),
     re_path(r'^statistcs/pushDay$', StatisticsController.statistcsPushDay),
     re_path(r'^statistcs/pushMonth$', StatisticsController.statistcsPushMonth),
-
-    # 统计alexa连接数
     re_path(r'^alexa/(?P<operation>.*)$', Alexa.AlexaConnectNum.as_view()),
-
-    # FAQ
     re_path(r'^faq/upload', FAQController.FAQUploadView.as_view()),
     re_path(r'^faq/image/(?P<filePath>.*)$', FAQController.getFAQImage.as_view()),
     re_path(r'^faq/(?P<operation>.*)$', FAQController.FAQView.as_view()),
-
-    # 苹果登录
     re_path(r'^ios/authsign', UserController.AppleAuthLogin.as_view()),
-    # app/设备上传日志接口
     re_path(r'^appLog/(?P<operation>.*)$', AppLogController.AppLogView.as_view()),
     re_path(r'^deviceLog/(?P<operation>.*)$', DeviceLogController.DeviceLogView.as_view()),
-    # 本地登录接口
     re_path(r'^local/(?P<operation>.*)$', UserController.LocalUserView.as_view()),
-
     re_path(r'^account/updateUserCountry', UserController.updateUserCountry),
     re_path(r'^equipmentVersionLimit/(?P<operation>.*)$', EquipmentVersionLimit.EquipmentVersionLimitView.as_view()),
-
-    # 订阅邮件
     re_path(r'^account/subscribe$', UserController.SubscribeEmailView.as_view()),
     re_path(r'^account/subscribe/download$', UserController.SubscribeEmailView.as_view()),
-
-    # 语音提示
     re_path(r'^voicePrompt/(?P<operation>.*)$', VoicePromptController.VoicePromptView.as_view()),
-    # 设备类型
     re_path(r'^deviceType/(?P<operation>.*)$', DeviceTypeController.DeviceTypeView.as_view()),
-
-    # cdk(激活码)
     re_path(r'^cdk/(?P<operation>.*)$', CDKController.CDKView.as_view()),
-    # 云存转移功能
     re_path(r'^cloudTransfer/(?P<operation>.*)$', CloudTransfer.cloudTestView.as_view()),
-    # 优惠券
     re_path(r'^coupon/(?P<operation>.*)$', CouponController.CouponView.as_view()),
-
-    # 云存服务统计
     re_path(r'^Cloudsum/(?P<operation>.*)$', Cloudsum.Cloudsum.as_view()),
-    # 设备ip地区统计
     re_path(r'^device/StatisticsIpRegion$', DeviceConfirmRegion.StatisticsIpRegion.as_view()),
-
-    # Iot Core
     re_path('iot/(?P<operation>.*)', IotCoreController.IotCoreView.as_view()),
-
-    # S3预签名
     re_path(r's3_getsts/(?P<operation>.*)$', S3GetStsController.S3GetStsView.as_view()),
-
-    # 云分配UID
     re_path('admin/', admin.site.urls),
     re_path('user/(?P<operation>.*)', UIDManageUserController.UserView.as_view()),
     re_path('uid/(?P<operation>.*)', UIDController.UIDView.as_view()),
@@ -317,54 +232,32 @@ urlpatterns = [
     re_path('vpg/(?P<operation>.*)', VPGController.VPGView.as_view()),
     re_path('vpgUid/uid', VPGController.do_upload_uid),
     re_path('language/(?P<operation>.*)', LanguageController.LanguageView.as_view()),
-
     re_path('test/(?P<operation>.*)', TestController.TestView.as_view()),
-    # 日志管理系统
     re_path(r'^OperatingLogs/(?P<operation>.*)$', OperatingLogs.OperatingLogsView.as_view()),
     re_path(r'^ProcessInfo/(?P<operation>.*)$', ProcessInfo.ProcessInfoView.as_view()),
     re_path(r'^Cloudsum/(?P<operation>.*)$', Cloudsum.Cloudsum.as_view()),
-
     re_path(r'regionCountry/(?P<operation>.*$)', RegionCountryController.RegionCountryView.as_view()),
-
-    # 验证验证码
     re_path(r'verifyCode/(?P<operation>.*$)', VerifyCodeController.VerifyCodeView.as_view()),
-
-    # 设备确定分配地区
     re_path(r'^device/confirmRegion$', DeviceConfirmRegion.ConfirmRegion.as_view()),
     re_path(r'^device/confirmRegionV2$', DeviceConfirmRegion.ConfirmRegionV2.as_view()),
     re_path(r'^device/confirmCountry$', DeviceConfirmRegion.confirm_country_with_ip),
-
-    # pc端软件信息
     re_path(r'^pcInfo/(?P<operation>.*)$', PcInfo.PcInfo.as_view()),
-
-    # pc端测试软件
     re_path(r'^pcTest/(?P<operation>.*)$', PctestController.PcTest.as_view()),
-
-    # 设备debug
     re_path('deviceDebug/(?P<operation>.*)', DeviceDebug.DeviceDebug.as_view()),
-
-    # 问卷调查
     re_path(r'^api/surveys/(?P<operation>.*)$', CloudStorageController.CloudStorageView.as_view()),
-    # 设备分享
     re_path(r'^api/device/share/(?P<operation>.*)$', UserDeviceShareController.UserDeviceShareView.as_view()),
-
-    # 网关家庭模块
     re_path(r'^app/sensor/gateway/(?P<operation>.*)$', EquipmentFamilyController.EquipmentFamilyView.as_view()),
     re_path(r'^loocam/', include("Ansjer.server_urls.loocam_url")),
-    # 联通4G套餐模块
     re_path(r'^unicom/', include("Ansjer.server_urls.unicom_url")),
-    # 算法小店
     re_path(r'^algorithm-shop/', include("Ansjer.server_urls.algorithm_shop_url")),
-    # KVS模块
     re_path(r'^kvs/', include("Ansjer.server_urls.kvs_url")),
-    # 超级密码模块
     re_path('appAccout/(?P<operation>.*)', SuperPasswordTool.SuperPasswordView.as_view()),
-
-    # 传感器网关
     re_path('sensorGateway/(?P<operation>.*)', SensorGatewayController.SensorGateway.as_view()),
+    re_path(r'^api/surveys/(?P<operation>.*)$', CloudStorageController.CloudStorageView.as_view()),
+    re_path(r'^api/device/share/(?P<operation>.*)$', UserDeviceShareController.UserDeviceShareView.as_view()),
 
-    # 后台界面接口 -----------------------------------------------------
-    # 用户登录信息等
+    # 后台界面接口 -------------------------------------------------------------------------------------------------------
+    # 登录,用户信息,权限
     re_path(r'^login$', UserManageController.LoginView.as_view()),
     re_path(r'^noPasslogin$', UserManageController.LoginView.as_view()),
     re_path(r'^userInfo$', UserManageController.GetPermissions.as_view()),
@@ -393,37 +286,11 @@ urlpatterns = [
     re_path(r'serial/(?P<operation>.*)', SerialManageController.SerialView.as_view()),
     # 数据系统模块
     re_path(r'^dataManagement/', include("Ansjer.server_urls.datasystem_url")),
-    # 后台界面接口 -----------------------------------------------------
-
-    # 问卷调查
-    re_path(r'^api/surveys/(?P<operation>.*)$', CloudStorageController.CloudStorageView.as_view()),
-    # 设备分享
-    re_path(r'^api/device/share/(?P<operation>.*)$', UserDeviceShareController.UserDeviceShareView.as_view()),
-
-    # 网关家庭模块
-    re_path(r'^app/sensor/gateway/(?P<operation>.*)$', EquipmentFamilyController.EquipmentFamilyView.as_view()),
-    re_path(r'^loocam/', include("Ansjer.server_urls.loocam_url")),
-    # 联通4G套餐模块
-    re_path(r'^unicom/', include("Ansjer.server_urls.unicom_url")),
-    # 算法小店
-    re_path(r'^algorithm-shop/', include("Ansjer.server_urls.algorithm_shop_url")),
-    # KVS模块
-    re_path(r'^kvs/', include("Ansjer.server_urls.kvs_url")),
-    # 超级密码模块
-
-    # 传感器网关
-    # 后台界面接口 -----------------------------------------------------
-    re_path(r'^login$', UserManageController.LoginView.as_view()),
-    re_path(r'^noPasslogin$', UserManageController.LoginView.as_view()),
-    re_path(r'^userInfo$', UserManageController.GetPermissions.as_view()),
-    re_path(r'^router/getList$', UserManageController.GetList.as_view()),
-    # 后台界面接口 -----------------------------------------------------
+    # 后台界面接口 -------------------------------------------------------------------------------------------------------
 
-    # 定时删除任务接口
+    # 定时任务接口
     re_path(r'^cron/del/(?P<operation>.*)', CronTaskController.CronDelDataView.as_view()),
-    # 定时更新任务接口
     re_path(r'^cron/update/(?P<operation>.*)', CronTaskController.CronUpdateDataView.as_view()),
-    # 定时收集数据任务接口
     re_path(r'^cron/collect/(?P<operation>.*)', CronTaskController.CronCollectDataView.as_view()),
 
     re_path('(?P<path>.*)', LogManager.errorPath),