牟新芬 3 rokov pred
rodič
commit
03fb024170

+ 8 - 4
app/api/controller/v1/Index.php

@@ -145,15 +145,19 @@ class Index extends BaseController
     public function code(Request $request, $id)
     {
         if (!$id || !($storeInfo = Product::getValidProduct($id, 'id'))) return app('json')->fail('商品不存在或已下架');
-        $user = $request->user();
+        $uid = $request->user['uid'];
         try {
             //小程序
-            $name = $id . '_' . $user['uid'] . '_product.jpg';
+            $name = $id . '_' . $uid . '_product.jpg';
             $imageInfo = Attachment::getInfo($name, 'name');
             if (!$imageInfo) {
-                $query = 'id=' . $id . '&uid=' . $user['uid'];
+                $path = 'pages/product/detail';
+                $query = 'id=' . $id . '&uid=' . $uid;
                 $mini = Factory::miniProgram(config('weixin')['mini_program']);
-                $res = $mini->app_code->getQrCode('pages/product/detail?'.$query, 280);
+                $res = $mini->app_code->getUnlimit($query, [
+                    'page'  => $path,
+                    'width' => 280
+                ]);
                 if (!$res) return app('json')->fail('二维码生成失败');
                 $upload = new Upload(2,config('upload')['stores']['qiniu']);
                 $res = $upload->to('routine/product')->validate()->stream($res, $name);

+ 2 - 16
app/system/controller/v1/Attachment.php

@@ -61,14 +61,7 @@ class Attachment extends BaseController
         ], $this->request, true);
         try {
             $path = make_path('attach', 2, true);
-            $config = [
-                'accessKey' => config('qiniu')['accessKeyId'],
-                'secretKey' => config('qiniu')['accessKeySecret'],
-                'uploadUrl' => 'imgs.boofly.cn',
-                'storageName' => config('qiniu')['bucket'],
-                'storageRegion' => 's3-cn-south-1.qiniucs.com',
-            ];
-            $upload = new Upload(2,$config);
+            $upload = new Upload(2,config('upload')['stores']['qiniu']);
             $res = $upload->to($path)->validate()->move($file);
             if ($res === false) {
                 return app('json')->fail($upload->getError());
@@ -92,14 +85,7 @@ class Attachment extends BaseController
         $attinfo = AttachmentModel::get($att_id);
         if ($attinfo) {
             try {
-                $config = [
-                    'accessKey' => config('qiniu')['accessKeyId'],
-                    'secretKey' => config('qiniu')['accessKeySecret'],
-                    'uploadUrl' => 'imgs.boofly.cn',
-                    'storageName' => config('qiniu')['bucket'],
-                    'storageRegion' => 's3-cn-south-1.qiniucs.com',
-                ];
-                $upload = new Upload(2,$config);
+                $upload = new Upload(2,config('upload')['stores']['qiniu']);
                 $upload->delete($attinfo['name']);
             } catch (\Throwable $e) {
             }

+ 1 - 8
library/services/UtilService.php

@@ -325,14 +325,7 @@ class  UtilService {
                 $info['thumb_path'] = $wapCodePath;
                 return $info;
             } else {
-                $config = [
-                    'accessKey' => config('qiniu')['accessKeyId'],
-                    'secretKey' => config('qiniu')['accessKeySecret'],
-                    'uploadUrl' => 'imgs.boofly.cn',
-                    'storageName' => config('qiniu')['bucket'],
-                    'storageRegion' => 's3-cn-south-1.qiniucs.com',
-                ];
-                $upload = new Upload(2,$config);
+                $upload = new Upload(2,config('upload')['stores']['qiniu']);
                 $res = $upload->to($outfile)->validate()->stream($content, $name);
                 if ($res === false) {
                     return $upload->getError();