upp

app/admin/controller/Test.php

@@ -8,6 +8,7 @@ class Test extends AdminBaseController
 
     public function index()
     {
+        $appNumber = env('APP_NUMBER');
         $appRootPath = app()->getRootPath();
         $appAppPath = app()->getAppPath();
         $memoryLimit = ini_get('memory_limit');
@@ -23,6 +24,7 @@ class Test extends AdminBaseController
             'max_input_time' => $max_input_time,
             'app_root_path' => $appRootPath,
             'app_path' => $appAppPath,
+            'app_number' => $appNumber
         ]]);
     }
 }

app/admin/controller/Upload.php

@@ -72,7 +72,7 @@ class Upload extends AdminBaseController
             if (isset($openFile)) {
                 fclose($openFile);
             }
-            return json(['code' => '100500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]);
+            return json(['code' => '500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]);
         }
     }
 
@@ -143,7 +143,7 @@ class Upload extends AdminBaseController
             if (isset($openFile)) {
                 fclose($openFile);
             }
-            return json(['code' => '100500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]);
+            return json(['code' => '500', 'message' => '系统繁忙', 'data' => [$exception->getMessage()]]);
         }
     }
 
@@ -201,6 +201,7 @@ class Upload extends AdminBaseController
            AwsS3Model::create([
                 'upload_id' => $result['UploadId'],
                 'key' => 'bourse-video-node/' . $fileName,
+                'parts' => '',
                 'name' => $fileName,
                 'mime' => $getMime,
                 'ext' => $getExt,
@@ -263,7 +264,7 @@ class Upload extends AdminBaseController
             ])->toArray();
             fclose($openFile);
             Log::info("上传分段结果：".json_encode($result));
-            if (empty($result['partNumber']) || empty($result['ETag'])) {
+            if (empty($result['ETag'])) {
                 return json(['code' => 400, 'message' => '上传分片失败']);
             }
 
@@ -293,7 +294,7 @@ class Upload extends AdminBaseController
             if (isset($openFile)) {
                 fclose($openFile);
             }
-            return json(['code' => '100500', 'message' => '上传失败', 'data' => [$exception->getMessage()]]);
+            return json(['code' => '500', 'message' => '上传失败', 'data' => [$exception->getMessage()]]);
         }
     }
 
@@ -313,7 +314,10 @@ class Upload extends AdminBaseController
             if (empty($awsS3) || empty($awsS3['parts']) || empty($awsS3['key'])) {
                 return json(['code' => 400, 'message' => 'uploadId对应的数据错误']);
             }
-            $parts = json_decode($awsS3['parts']);
+            // 取出上传的分片记录，并排序
+            $parts = json_decode($awsS3['parts'],true);
+            $partNumbers = array_column($parts, 'PartNumber');
+            array_multisort($partNumbers, SORT_ASC, $parts);
 
             // 初始化s3客户端
             $s3Config = Config::get('common.aws_s3');
@@ -337,17 +341,20 @@ class Upload extends AdminBaseController
 
             // 更新分片上传记录
             $awsS3->is_complete = 1;
-            $awsS3->parts = json_encode($param['parts']);
             $awsS3->s3_url = $result['Location'];
             $awsS3->save();
 
-            return json(['code' => 200, 'message' => '上传成功', 'data'=>[
+            return json([
+                'code' => 0,
+                'message' => '上传成功',
+                'data'=>[
                     'id' => $awsS3->id,
                     'uploadId' => $param['uploadId'],
                     'location' => $result['Location'],
-            ]]);
+                    ]
+            ]);
         } catch (\Exception $exception) {
-            return json(['code' => '100500', 'message' => '完成上传失败', 'data' => [$exception->getMessage()]]);
+            return json(['code' => '500', 'message' => '完成上传失败', 'data' => [$exception->getMessage()]]);
         }
     }
 
@@ -374,9 +381,9 @@ class Upload extends AdminBaseController
                 'UploadId' => $param['uploadId'],
             ]);
             Log::info('终止分段上传结果：'.json_encode($result));
-            return json(['code' => 200, 'message' => '上传已取消']);
+            return json(['code' => 0, 'message' => '上传已取消']);
         } catch (\Exception $exception) {
-            return json(['code' => '100500', 'message' => '取消上传失败', 'data' => [$exception->getMessage()]]);
+            return json(['code' => '500', 'message' => '取消上传失败', 'data' => [$exception->getMessage()]]);
         }
     }
 

app/admin/controller/setting/Forex.php

@@ -47,7 +47,7 @@ class Forex extends AdminBaseController
     public function hq_index()
     {
         $service = new ForexService();
-        $result = $service->hq_index();
+        $result = $service->hq_index($this->request->param());
         return json($result);
     }
 

app/admin/route/app.php

@@ -213,7 +213,7 @@ Route::group('/', function () {
     Route::post('admin/send_email_or_sms', 'Admin/sendEmailOrSms');  // 给用户发邮件或者短信
 
     // 配置管理
-    // 合约插针行情
+    // 外汇插针行情
     Route::post('/setting/forex_hq_index', 'setting.Forex/hq_index');
     Route::post('/setting/forex_hq_add', 'setting.Forex/hq_add');
     Route::post('/setting/forex_hq_edit', 'setting.Forex/hq_edit');

app/admin/service/LoginService.php

@@ -29,12 +29,12 @@ class LoginService extends AdminBaseService
             if(empty($info)){
                 return $this->toData('200300', 'Incorrect account or password.1', []);
             }
-            if($info->status!==1){
-                return $this->toData('200300', '该账户已被禁用', []);
+            if($info->status != 1){
+                return $this->toData('200300', '该账户已被禁用', ['status'=>$info->status]);
             }
             //查看角色状态
             $role=AuthRoleModel::find($info->role_id);
-            if(!$role||$role->status!==1){
+            if(empty($role) || $role->status !=1){
                 return $this->toData('200300', '该账户所在的群组已被禁用', []);
             }
             // 校验密码

composer.json

@@ -34,7 +34,7 @@
         "guzzlehttp/guzzle": "^7.7",
         "lcobucci/jwt": "^4.0",
         "phpoffice/phpspreadsheet": "^1.29",
-        "ext-json": "*",
+        "ext-json": "*"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",