Merge branch 'master' of http://gogsb.soaringnova.com/chenguilong/yl-ocr-layout

Dockerfile

@@ -102,8 +102,9 @@ RUN git clone https://gitee.com/monkeycc/yolov5.git
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/yili.pt
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/best.pt
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/best2.pt
-# RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/yili2.pt
-RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/xxc_yolo_8.25.pt
+#RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/8-14_layout_model.pt
+RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/0822yili.pt
+
 
 ADD . /workspace
 EXPOSE 8080

server.py

@@ -17,7 +17,8 @@ YOLO_DIR = '/workspace/yolov5'
 # WEIGHTS = '/workspace/best.pt'
 # WEIGHTS = '/workspace/yili.pt'
 # WEIGHTS = '/workspace/best2.pt'
-WEIGHTS = '/workspace/xxc_yolo_8.25.pt'
+
+WEIGHTS = '/workspace/0822yili.pt'
 
 logger = logging.getLogger('log')
 logger.setLevel(logging.DEBUG)