wesley vor 7 Jahren
Ursprung
Commit
32cf85bddf
56 geänderte Dateien mit 13 neuen und 8 gelöschten Zeilen
  1. BIN
      .DS_Store
  2. 1 4
      app/Http/Controllers/Admin/Album/OrderController.php
  3. 10 3
      app/Http/Controllers/Api/V1/FurnitureController.php
  4. BIN
      app/libs/.DS_Store
  5. 0 0
      app/libs/qrlib/Binarizer.php
  6. 0 0
      app/libs/qrlib/BinaryBitmap.php
  7. 0 0
      app/libs/qrlib/ChecksumException.php
  8. 0 0
      app/libs/qrlib/FormatException.php
  9. 0 0
      app/libs/qrlib/GDLuminanceSource.php
  10. 0 0
      app/libs/qrlib/IMagickLuminanceSource.php
  11. 0 0
      app/libs/qrlib/LuminanceSource.php
  12. 0 0
      app/libs/qrlib/NotFoundException.php
  13. 0 0
      app/libs/qrlib/PlanarYUVLuminanceSource.php
  14. 0 0
      app/libs/qrlib/QrReader.php
  15. 0 0
      app/libs/qrlib/RGBLuminanceSource.php
  16. 0 0
      app/libs/qrlib/Reader.php
  17. 0 0
      app/libs/qrlib/ReaderException.php
  18. 0 0
      app/libs/qrlib/Result.php
  19. 0 0
      app/libs/qrlib/ResultPoint.php
  20. 0 0
      app/libs/qrlib/common/AbstractEnum.php
  21. 0 0
      app/libs/qrlib/common/BitArray.php
  22. 0 0
      app/libs/qrlib/common/BitMatrix.php
  23. 0 0
      app/libs/qrlib/common/BitSource.php
  24. 0 0
      app/libs/qrlib/common/CharacterSetEci.php
  25. 0 0
      app/libs/qrlib/common/DecoderResult.php
  26. 0 0
      app/libs/qrlib/common/DefaultGridSampler.php
  27. 0 0
      app/libs/qrlib/common/DetectorResult.php
  28. 0 0
      app/libs/qrlib/common/GlobalHistogramBinarizer.php
  29. 0 0
      app/libs/qrlib/common/GridSampler.php
  30. 0 0
      app/libs/qrlib/common/HybridBinarizer.php
  31. 0 0
      app/libs/qrlib/common/PerspectiveTransform.php
  32. 0 0
      app/libs/qrlib/common/customFunctions.php
  33. 0 0
      app/libs/qrlib/common/detector/MathUtils.php
  34. 0 0
      app/libs/qrlib/common/detector/MonochromeRectangleDetector.php
  35. 0 0
      app/libs/qrlib/common/reedsolomon/GenericGF.php
  36. 0 0
      app/libs/qrlib/common/reedsolomon/GenericGFPoly.php
  37. 0 0
      app/libs/qrlib/common/reedsolomon/ReedSolomonDecoder.php
  38. 0 0
      app/libs/qrlib/common/reedsolomon/ReedSolomonException.php
  39. 0 0
      app/libs/qrlib/qrcode/QRCodeReader.php
  40. 0 0
      app/libs/qrlib/qrcode/decoder/BitMatrixParser.php
  41. 0 0
      app/libs/qrlib/qrcode/decoder/DataBlock.php
  42. 0 0
      app/libs/qrlib/qrcode/decoder/DataMask.php
  43. 0 0
      app/libs/qrlib/qrcode/decoder/DecodedBitStreamParser.php
  44. 0 0
      app/libs/qrlib/qrcode/decoder/Decoder.php
  45. 0 0
      app/libs/qrlib/qrcode/decoder/ErrorCorrectionLevel.php
  46. 0 0
      app/libs/qrlib/qrcode/decoder/FormatInformation.php
  47. 0 0
      app/libs/qrlib/qrcode/decoder/Mode.php
  48. 0 0
      app/libs/qrlib/qrcode/decoder/Version.php
  49. 0 0
      app/libs/qrlib/qrcode/detector/AlignmentPattern.php
  50. 0 0
      app/libs/qrlib/qrcode/detector/AlignmentPatternFinder.php
  51. 0 0
      app/libs/qrlib/qrcode/detector/Detector.php
  52. 0 0
      app/libs/qrlib/qrcode/detector/FinderPattern.php
  53. 0 0
      app/libs/qrlib/qrcode/detector/FinderPatternFinder.php
  54. 0 0
      app/libs/qrlib/qrcode/detector/FinderPatternInfo.php
  55. 2 1
      composer.json
  56. BIN
      public/.DS_Store

BIN
.DS_Store


+ 1 - 4
app/Http/Controllers/Admin/Album/OrderController.php

xqd
@@ -283,13 +283,10 @@ class OrderController extends Controller
             'response_type' => 'array',
         ];
         $app = Factory::miniProgram($config);
-        $response = $app->app_code->getQrCode('pages/search/search?order_id=' . $id,400);
+        $response = $app->app_code->getQrCode('pages/search/search?order_id=' . $id,300);
         $path = public_path() . '/download';
         $qrcode = $response->save($path, $id);
 
-        $real_path = $path .'/'. $qrcode;
-
-        Image::make($real_path)->crop(423, 415 , 0 , 0)->save($real_path);
         if ($qrcode) {
             $qrcode = env('APP_URL') . '/download/' . $id . '.jpg';
             $order = AlbumOrderModel::find($id);

+ 10 - 3
app/Http/Controllers/Api/V1/FurnitureController.php

xqd xqd
@@ -23,6 +23,8 @@ use MGQrCodeReader\MGQrCodeReader;
 use Validator, Auth ,Image;
 use App\Services\Base\ErrorCode;
 use EasyWeChat\Factory;
+use Zxing\Qrcode\QRCodeReader;
+use ZBarCodeImage,ZBarCodeScanner;
 
 
 class FurnitureController extends Controller
@@ -1945,10 +1947,15 @@ class FurnitureController extends Controller
         $filename = explode('/', $order->qrcode);
         $filename = end($filename);
         $qrcode = public_path() . '/download/' . $filename;
-        $QrReader = new \QrReader($qrcode);
-        $qrcodetext = $QrReader->text();
 
-        dump($qrcodetext);
+        $image = new ZBarCodeImage($qrcode);
+        $scanner = new ZBarCodeScanner();
+        $qrcodedata = $scanner->scan($image);
+        $qrcodetext = $qrcodedata[0]['data'];
+
+//        $QrReader = new \QrReader($qrcode);
+//        $qrcodetext = $QrReader->text();
+
         $content = "";
         if ($role == 2) {
             $content .= "--------------------------------<BR>";

BIN
app/libs/.DS_Store


+ 0 - 0
app/libs/qrcode/Binarizer.php → app/libs/qrlib/Binarizer.php


+ 0 - 0
app/libs/qrcode/BinaryBitmap.php → app/libs/qrlib/BinaryBitmap.php


+ 0 - 0
app/libs/qrcode/ChecksumException.php → app/libs/qrlib/ChecksumException.php


+ 0 - 0
app/libs/qrcode/FormatException.php → app/libs/qrlib/FormatException.php


+ 0 - 0
app/libs/qrcode/GDLuminanceSource.php → app/libs/qrlib/GDLuminanceSource.php


+ 0 - 0
app/libs/qrcode/IMagickLuminanceSource.php → app/libs/qrlib/IMagickLuminanceSource.php


+ 0 - 0
app/libs/qrcode/LuminanceSource.php → app/libs/qrlib/LuminanceSource.php


+ 0 - 0
app/libs/qrcode/NotFoundException.php → app/libs/qrlib/NotFoundException.php


+ 0 - 0
app/libs/qrcode/PlanarYUVLuminanceSource.php → app/libs/qrlib/PlanarYUVLuminanceSource.php


+ 0 - 0
app/libs/qrcode/QrReader.php → app/libs/qrlib/QrReader.php


+ 0 - 0
app/libs/qrcode/RGBLuminanceSource.php → app/libs/qrlib/RGBLuminanceSource.php


+ 0 - 0
app/libs/qrcode/Reader.php → app/libs/qrlib/Reader.php


+ 0 - 0
app/libs/qrcode/ReaderException.php → app/libs/qrlib/ReaderException.php


+ 0 - 0
app/libs/qrcode/Result.php → app/libs/qrlib/Result.php


+ 0 - 0
app/libs/qrcode/ResultPoint.php → app/libs/qrlib/ResultPoint.php


+ 0 - 0
app/libs/qrcode/common/AbstractEnum.php → app/libs/qrlib/common/AbstractEnum.php


+ 0 - 0
app/libs/qrcode/common/BitArray.php → app/libs/qrlib/common/BitArray.php


+ 0 - 0
app/libs/qrcode/common/BitMatrix.php → app/libs/qrlib/common/BitMatrix.php


+ 0 - 0
app/libs/qrcode/common/BitSource.php → app/libs/qrlib/common/BitSource.php


+ 0 - 0
app/libs/qrcode/common/CharacterSetEci.php → app/libs/qrlib/common/CharacterSetEci.php


+ 0 - 0
app/libs/qrcode/common/DecoderResult.php → app/libs/qrlib/common/DecoderResult.php


+ 0 - 0
app/libs/qrcode/common/DefaultGridSampler.php → app/libs/qrlib/common/DefaultGridSampler.php


+ 0 - 0
app/libs/qrcode/common/DetectorResult.php → app/libs/qrlib/common/DetectorResult.php


+ 0 - 0
app/libs/qrcode/common/GlobalHistogramBinarizer.php → app/libs/qrlib/common/GlobalHistogramBinarizer.php


+ 0 - 0
app/libs/qrcode/common/GridSampler.php → app/libs/qrlib/common/GridSampler.php


+ 0 - 0
app/libs/qrcode/common/HybridBinarizer.php → app/libs/qrlib/common/HybridBinarizer.php


+ 0 - 0
app/libs/qrcode/common/PerspectiveTransform.php → app/libs/qrlib/common/PerspectiveTransform.php


+ 0 - 0
app/libs/qrcode/common/customFunctions.php → app/libs/qrlib/common/customFunctions.php


+ 0 - 0
app/libs/qrcode/common/detector/MathUtils.php → app/libs/qrlib/common/detector/MathUtils.php


+ 0 - 0
app/libs/qrcode/common/detector/MonochromeRectangleDetector.php → app/libs/qrlib/common/detector/MonochromeRectangleDetector.php


+ 0 - 0
app/libs/qrcode/common/reedsolomon/GenericGF.php → app/libs/qrlib/common/reedsolomon/GenericGF.php


+ 0 - 0
app/libs/qrcode/common/reedsolomon/GenericGFPoly.php → app/libs/qrlib/common/reedsolomon/GenericGFPoly.php


+ 0 - 0
app/libs/qrcode/common/reedsolomon/ReedSolomonDecoder.php → app/libs/qrlib/common/reedsolomon/ReedSolomonDecoder.php


+ 0 - 0
app/libs/qrcode/common/reedsolomon/ReedSolomonException.php → app/libs/qrlib/common/reedsolomon/ReedSolomonException.php


+ 0 - 0
app/libs/qrcode/qrcode/QRCodeReader.php → app/libs/qrlib/qrcode/QRCodeReader.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/BitMatrixParser.php → app/libs/qrlib/qrcode/decoder/BitMatrixParser.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/DataBlock.php → app/libs/qrlib/qrcode/decoder/DataBlock.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/DataMask.php → app/libs/qrlib/qrcode/decoder/DataMask.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/DecodedBitStreamParser.php → app/libs/qrlib/qrcode/decoder/DecodedBitStreamParser.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/Decoder.php → app/libs/qrlib/qrcode/decoder/Decoder.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/ErrorCorrectionLevel.php → app/libs/qrlib/qrcode/decoder/ErrorCorrectionLevel.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/FormatInformation.php → app/libs/qrlib/qrcode/decoder/FormatInformation.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/Mode.php → app/libs/qrlib/qrcode/decoder/Mode.php


+ 0 - 0
app/libs/qrcode/qrcode/decoder/Version.php → app/libs/qrlib/qrcode/decoder/Version.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/AlignmentPattern.php → app/libs/qrlib/qrcode/detector/AlignmentPattern.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/AlignmentPatternFinder.php → app/libs/qrlib/qrcode/detector/AlignmentPatternFinder.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/Detector.php → app/libs/qrlib/qrcode/detector/Detector.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/FinderPattern.php → app/libs/qrlib/qrcode/detector/FinderPattern.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/FinderPatternFinder.php → app/libs/qrlib/qrcode/detector/FinderPatternFinder.php


+ 0 - 0
app/libs/qrcode/qrcode/detector/FinderPatternInfo.php → app/libs/qrlib/qrcode/detector/FinderPatternInfo.php


+ 2 - 1
composer.json

xqd xqd
@@ -8,6 +8,7 @@
         "php": ">=7.0.0",
         "dingo/api": "2.0.*@dev",
         "doctrine/dbal": "^2.7",
+        "dsiddharth2/php-zxing": "^1.0",
         "fideloper/proxy": "~3.3",
         "intervention/image": "^2.4",
         "laravel/framework": "5.5.*",
@@ -30,7 +31,7 @@
             "database/factories",
             "app/Helper/wxbdc/WXBizDataCrypt.php",
             "app/Helper/Grafika",
-            "app/libs/qrcode",
+            "app/libs/qrlib",
             "app/libs/print"
         ],
         "psr-4": {

BIN
public/.DS_Store