update:小优化

vdreamwin · Mar 12, 2022 · a2e4c38 · a2e4c38
1 parent 773bffa
commit a2e4c38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -42,3 +42,7 @@ DUJIAO_ADMIN_LANGUAGE=zh_CN
 
 # 后台登录地址
 ADMIN_ROUTE_PREFIX={admin_path}
+
+# 是否开启https (前端开启了后端也必须为true)
+# 后台登录出现0err或者其他登录异常问题，大概率是开启了https而后台没有开启，把下面的false改为true即可
+ADMIN_HTTPS=false
diff --git a/app/Http/Controllers/Pay/AlipayController.php b/app/Http/Controllers/Pay/AlipayController.php
@@ -42,7 +42,7 @@ public function gateway(string $payway, string $orderSN)
                 case 'alipayscan':
                     try{
                         $result = Pay::alipay($config)->scan($order)->toArray();
-                        $result['payname'] = $this->payGateway->pay_name;
+                        $result['payname'] = $this->order->order_sn;
                         $result['actual_price'] = (float)$this->order->actual_price;
                         $result['orderid'] = $this->order->order_sn;
                         $result['jump_payuri'] = $result['qr_code'];

diff --git a/app/Http/Controllers/Pay/PayjsController.php b/app/Http/Controllers/Pay/PayjsController.php
@@ -17,7 +17,7 @@ public function gateway(string $payway, string $orderSN)
             $this->loadGateWay($orderSN, $payway);
             // 构造订单基础信息
             $data = [
-                'body' => $this->order->title,                                // 订单标题
+                'body' => $this->order->order_sn,                                // 订单标题
                 'total_fee' => bcmul($this->order->actual_price, 100, 0),    // 订单金额
                 'out_trade_no' => $this->order->order_sn,                           // 订单号
                 'notify_url' => url($this->payGateway->pay_handleroute . '/notify_url'),

diff --git a/composer.json b/composer.json
@@ -34,7 +34,8 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "platform-check": false
     },
     "extra": {
         "laravel": {

diff --git a/config/dujiaoka.php b/config/dujiaoka.php
@@ -8,7 +8,7 @@
  */
 
 return [
-    'dujiaoka_version' => '2.0.2',
+    'dujiaoka_version' => '2.0.3',
     // 模板集合
     'templates' => [
         'unicorn' => '官方[unicorn-独角兽]',