Quellcode durchsuchen

上传

tags/V1.0.1
chenyukun vor 1 Jahr
Ursprung
Commit
563c251fa3
2 geänderte Dateien mit 9 neuen und 199 gelöschten Zeilen
  1. +6
    -198
      .idea/workspace.xml
  2. +3
    -1
      enums/ExceptionEnum.py

+ 6
- 198
.idea/workspace.xml Datei anzeigen

@@ -6,204 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="4f7dccd9-8f92-4a6e-90cc-33890d102263" name="Changes" comment="Changes">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/Constant.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/Constant.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/common/RequestSchema.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/common/YmlConstant.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/FileUploadThread.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/HeartbeatThread.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/IntelligentRecognitionProcess.py" beforeDir="false" afterPath="$PROJECT_DIR$/concurrency/IntelligentRecognitionProcess.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/PullStreamThread.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/PullVideoStreamProcess.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/config/dsp_application.json" beforeDir="false" afterPath="$PROJECT_DIR$/config/application.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/dsp_logger.json" beforeDir="false" afterPath="$PROJECT_DIR$/config/logger.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dsp_master.py" beforeDir="false" afterPath="$PROJECT_DIR$/master.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/entity/FeedBack.py" beforeDir="false" afterPath="$PROJECT_DIR$/entity/FeedBack.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enums/ExceptionEnum.py" beforeDir="false" afterPath="$PROJECT_DIR$/enums/ExceptionEnum.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enums/PushStreamStatusEnum.py" beforeDir="false" afterPath="$PROJECT_DIR$/enums/StatusEnum.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/font/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/font/simsun.ttc" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/image/logo.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/service/Dispatcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/service/Dispatcher.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/aaa.jpeg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/ossdemo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/vod.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/vodTest.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/voddemo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/vodtest1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/aliyun/vodtest2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/ChainMap.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/Counter.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/OrderedDict.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/defaultdict.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/deque.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/collections/namedtuple.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/color/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/color/color_test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/color/platech.ttf" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/cpu/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/cpu/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/cuda/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/cuda/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/cuda/test1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/demo/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/demo/demo1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/demo/demo2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/demo1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/editimage/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/editimage/editImage.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/Test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/aa.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/cv2test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/cv2test1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg11.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg12.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg13.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg3.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ffmpeg11/ffmpeg33.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/gpu/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/gpu/gputest.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/gpu/gputest1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/image/1.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/image/11.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/image/2.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/image/22.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ip/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/ip/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/kafka/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/kafka/producer_start.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/kafka/producer_stop.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/minio1/minio_test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/numpy/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/numpy/numpy_test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/opencv/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/opencv/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/os/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/os/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/pachong/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/pachong/pa.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/str/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/validate/Test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/validate/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/while/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/while/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/wifi/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/wifi/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/偏函数/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/偏函数/cmp_to_key.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/偏函数/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/偏函数/singledispatch.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/偏函数/wraps.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/元类/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/元类/demo1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/内存优化/slots/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/内存优化/slots/test1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/内置函数/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/内置函数/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/asnyc.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/asnyc回调.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/协程.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/协程1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/协程2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/协程3.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/协程/协程笔记.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/字典/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/字典/字典.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/序列化/Test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/序列化/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/序列化/test1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/异常/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/异常/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/日志/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/正则/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/正则/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/正则/re.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/ORB算法.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/same1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/same2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/same3.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/互信息.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/余弦相似度计算.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/视频添加图片水印1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/视频添加文字水印.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/视频添加文字水印1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/视频添加文字水印2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/水印/视频添加文字水印3.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/游戏/Food.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/游戏/SnakeGame.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/游戏/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/游戏/food.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/游戏/snake.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/算法/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/算法/冒泡.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/算法/插入.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/算法/选择.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/类型标注/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/类型标注/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/类型标注/test1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/线程/Test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/装饰器/装饰器.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/demo2.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/demo3.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/demo4.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/demo5.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/single.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/单例/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/简单工厂模式/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/简单工厂模式/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/设计模式/简单工厂模式/demo1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/datetime/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/datetime/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/for/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/for/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/list/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/list/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/statistics_test/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/statistics_test/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/time/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/time/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/全局变量.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/全局变量1.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/回调.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/语法/装饰器/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/csv_test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/data.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/demo.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/dsp_application.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/读写/hello.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/路径/Test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/路径/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/进程/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/进程/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/test/集合/test.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/AliyunSdk.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/Cv2Utils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/ImageUtils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/ImgBaiduSdk.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/LogUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/LogUtils.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/ModelUtils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/MyConnectionPool.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/OcrBaiduSdk.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/PlotsUtils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/PushStreamUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/PushStreamUtils.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/QueRiver.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/util/TorchUtils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/AliyunVodUploader.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/AliyunVodUtils.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/UploadAttachedMediaRequest.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/UploadImageRequest.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/UploadVideoRequest.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/vodsdk/__init__.py" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -866,7 +669,7 @@
<workItem from="1688561946065" duration="3245000" />
<workItem from="1688601703473" duration="2291000" />
<workItem from="1688605506802" duration="20143000" />
<workItem from="1688688565244" duration="6814000" />
<workItem from="1688688565244" duration="8373000" />
</task>
<servers />
</component>
@@ -902,6 +705,11 @@
<line>134</line>
<option name="timeStamp" value="6" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/enums/ExceptionEnum.py</url>
<line>33</line>
<option name="timeStamp" value="7" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>

+ 3
- 1
enums/ExceptionEnum.py Datei anzeigen

@@ -17,7 +17,9 @@ class ExceptionType(Enum):

PULL_STREAM_TIMEOUT_EXCEPTION = ("PS005", "通道地址拉流超时!")

PULL_STREAM_NUM_LIMIT_EXCEPTION = ("PS006", "推流数量超过限制!")
PULL_STREAM_NUM_LIMIT_EXCEPTION = ("PS006", "推流路数超过限制!")

ILLEGAL_PARAMETER_FORMAT = ("PS007", "推流参数格式非法!")

NOT_REQUESTID_TASK_EXCEPTION = ("PS993", "未查询到该任务,无法停止任务!")


Laden…
Abbrechen
Speichern