Merge branch 'dev-frontend' of hlm/TuKouKouClient into master

electron/controller/imageMatting.js

@@ -4,6 +4,10 @@ const { Controller } = require('ee-core');
 const Log = require('ee-core/log');
 const { dialog } = require('electron');
 const { checkSelectImages,segmentImages,modelFormSegment }  = require('../api/imageMatting')
+const errData = {
+  msg :'请求失败，请联系管理员',
+  code:999
+}
 
 /**
  * example
@@ -67,7 +71,10 @@ class ImageMattingController extends Controller {
       }
     }
 
-    const res = await checkSelectImages(selectParams)
+    const res = await checkSelectImages(selectParams).catch(e=>{
+      Log.info(e);
+      return errData
+    })
 
 
     Log.info(res.data);
@@ -93,7 +100,10 @@ class ImageMattingController extends Controller {
             delete modelParams.out_width
             delete modelParams.out_height
           }
-          const img  = await  modelFormSegment(modelParams)
+          const img  = await  modelFormSegment(modelParams).catch(e=>{
+            Log.info(e);
+            return errData
+          })
 
           if(img.data){
             return   img.data
@@ -109,6 +119,9 @@ class ImageMattingController extends Controller {
           "segment_type":  params.segment_type,  //抠图精细度;0普通;1精细
           "output_type":  params.output_type,  //出图模式 ;0透明;1白底
           "need_cutout_images":  res.data.data
+        }).catch(e=>{
+          Log.info(e);
+          return errData
         })
         if(img.data){
           return   img.data

electron/controller/utils.js

@@ -5,7 +5,10 @@ const { shell  } = require('electron');
 const Log = require('ee-core/log');
 const autoUpdater = require('../addon/autoUpdater');
 const { searchBacthProgress }  = require('../api/imageMatting')
-
+const errData = {
+  msg :'请求失败，请联系管理员',
+  code:999
+}
 
 /**
  * example
@@ -49,7 +52,10 @@ class UtilsController extends Controller {
 
   async checkProgress(params){
     console.log('checkProgress')
-    const res  = await  searchBacthProgress(params)
+    const res  = await  searchBacthProgress(params).catch(e=>{
+      Log.info(e);
+      return errData
+    })
     console.log(res)
     if( res.data){
         return res.data