Merge branch 'release' of gitadmin/tuoheng_alg_fangke into develop

.idea/workspace.xml

@@ -6,7 +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$/service/Dispatcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/service/Dispatcher.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/baidusdk/baidusdk.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/baidusdk/baidusdk.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/util/ModelUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/ModelUtils.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -78,6 +78,7 @@
     </file-type-list>
   </component>
   <component name="GitToolBoxStore">
+    <option name="projectConfigVersion" value="5" />
     <option name="recentBranches">
       <RecentBranches>
         <option name="branchesForRepo">
@@ -208,13 +209,13 @@
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="sftp://thsw2@192.168.10.66:22/home/thsw2/anaconda3/envs/chenyukun/bin/python3.8" />
-      <option name="WORKING_DIRECTORY" value="/home/DATA/chenyukun/fk" />
+      <option name="SDK_HOME" value="sftp://dell@192.168.10.12:22/home/dell/anaconda3/envs/prod/bin/python3.8" />
+      <option name="WORKING_DIRECTORY" value="/home/chenyukun/fk" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="/home/DATA/chenyukun/fk/test/baidusdk/baidusdk.py" />
+      <option name="SCRIPT_NAME" value="/home/chenyukun/fk/test/baidusdk/baidusdk.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -361,6 +362,7 @@
       <workItem from="1668146121972" duration="2387000" />
       <workItem from="1668423781277" duration="652000" />
       <workItem from="1668478677307" duration="214000" />
+      <workItem from="1668495580103" duration="3688000" />
     </task>
     <servers />
   </component>
@@ -412,7 +414,7 @@
     <SUITE FILE_PATH="coverage/tuoheng_fk$image.coverage" NAME="image 覆盖结果" MODIFIED="1667547816366" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/协程" />
     <SUITE FILE_PATH="coverage/tuoheng_alg$TimeUtils.coverage" NAME="TimeUtils Coverage Results" MODIFIED="1661222768678" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/util" />
     <SUITE FILE_PATH="coverage/tuoheng_fk_python$aaliyunsdk.coverage" NAME="ailiyunsdk2 覆盖结果" MODIFIED="1667959131471" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/chenyukun/fk/test/baidusdk" />
-    <SUITE FILE_PATH="coverage/tuoheng_fk_python$baidusdk.coverage" NAME="baidusdk 覆盖结果" MODIFIED="1668074335386" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/DATA/chenyukun/fk" />
+    <SUITE FILE_PATH="coverage/tuoheng_fk_python$baidusdk.coverage" NAME="baidusdk 覆盖结果" MODIFIED="1668497658048" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/chenyukun/fk" />
     <SUITE FILE_PATH="coverage/tuoheng_fk$Dispatcher.coverage" NAME="Dispatcher 覆盖结果" MODIFIED="1667810228478" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" />
     <SUITE FILE_PATH="coverage/tuoheng_alg$3.coverage" NAME="视频添加文字水印3 Coverage Results" MODIFIED="1661906152928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
   </component>

test/baidusdk/baidusdk.py

@@ -8,7 +8,7 @@ client = AipOcr(str(28173504), 'kqrFE7VuygIaFer7z6cRxzoi',
                      'yp7xBokyl4TItyGhay7skAN1cMwfvEXf')
 # client = AipOcr(str(28324292), 'l58x9bqCsPOpyexGqrM86jhy',
 #                 '1qECRaULUZBfOPejVIWUGLahUHGMQoni')
-im0 = cv2.imread('/home/thsw2/tuo_heng/prod/healthCode/imgs/pff9504t6fd_1667544805350.jfif')
+im0 = cv2.imread('/home/chenyukun/healthCode/imgs/jkm/1668493089006.jpg')
 
 or_result, or_image = cv2.imencode(".jpg", im0)
 # with open("/home/chenyukun/fk/fk_application.yml", 'r', encoding='utf-8') as f:

util/ModelUtils.py

@@ -11,12 +11,13 @@ from utilsK.general import pre_process, post_process, get_return_data
 class Model():
     def __init__(self):
         self.par = {'code': {'weights': '../healthCode/weights/health_yolov5s_v3.jit', 'img_type': 'code', 'nc': 10},
-                    'plate': {'weights': '../healthCode/weights/plate_yolov5s_v2.jit', 'img_type': 'plate', 'nc': 1},
+                    'plate': {'weights': '../healthCode/weights/plate_yolov5s_v3.jit', 'img_type': 'plate', 'nc': 1},
                     'conf_thres': 0.4,
                     'iou_thres': 0.45,
                     'device': 'cuda:0',
                     'plate_dilate': (0.5, 0.3)
                     }
+
         ###加载模型
         self.device = torch.device(self.par['device'])
         self.model = torch.jit.load(self.par['code']['weights'])