d

bpo-web/app/base/utils/qrClient.js

@@ -8,14 +8,14 @@ class QrClient{
 
 
   /**
   /**
    * fn:生成二维码
    * fn:生成二维码
-   * @return buffer
+   * @return http连接  上传失败后返回null
    * @param key
    * @param key
    * @returns {Promise<void>}
    * @returns {Promise<void>}
    */
    */
   async generateQR(text){
   async generateQR(text){
     try {
     try {
       if(!text){
       if(!text){
-        return;
+        return null;
       }
       }
       let key = "_"+new Date().getTime(), filePath = settings.localPath();
       let key = "_"+new Date().getTime(), filePath = settings.localPath();
       var qr_png = qr.image(text, {size :10 });
       var qr_png = qr.image(text, {size :10 });
@@ -25,7 +25,6 @@ class QrClient{
         return null;
         return null;
       }
       }
       let urlRes = await new ossClient().upfile(key,`${filePath}${key}.png`);
       let urlRes = await new ossClient().upfile(key,`${filePath}${key}.png`);
-
       fs.unlink(`${filePath}${key}.png`, (err) => {
       fs.unlink(`${filePath}${key}.png`, (err) => {
         if (err){
         if (err){
           console.log(`二维码删除失败`);
           console.log(`二维码删除失败`);
@@ -35,6 +34,7 @@ class QrClient{
       return urlRes.url;
       return urlRes.url;
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);
+      return null;
     }
     }
   }
   }
 }
 }