zxhxx 3 年之前
父節點
當前提交
2707df4eec

+ 1 - 1
app/admin/controller/setting/SystemConfig.php

@@ -368,7 +368,7 @@ class SystemConfig extends AuthController
     public function file_upload()
     {
         $upload = new Upload('local');
-        $res = $upload->to('config/file')->validate()->move($this->request->param('file', 'file'));
+        $res = $upload->to('config/file')->move($this->request->param('file', 'file'));
         if ($res === false) return Json::fail($upload->getError());
         return Json::successful('上传成功!', ['filePath' => $res->filePath]);
     }

+ 10 - 0
app/api/controller/PublicController.php

@@ -320,5 +320,15 @@ class PublicController
         })->limit(3)->order('uid desc')->column('avatar');
         return app('json')->successful($data);
     }
+    /**
+     * 获取APP版本
+     * @return mixed
+     */
+    public function app_version()
+    {
+        $data['app_version'] = sys_config('app_version');
+        $data['file_url'] = sys_config('site_url').sys_config('app_file');
+        return app('json')->successful($data);
+    }
 
 }

+ 1 - 1
app/models/store/StoreGp.php

@@ -124,7 +124,7 @@ class StoreGp extends BaseModel
                     if($spuser && $user['spread_uid']>0 && $spuser['cycle_time']>time())
                     {
                         $balance = bcadd($spuser['brokerage_price'], $sp_brokeragePrice, 2);
-                        $mark = "公排号:" . $no . '推荐奖' . $order['$sp_brokeragePrice'] . "元,订单号:" . $order['order_id'];
+                        $mark = "公排号:" . $no . '推荐奖' . $sp_brokeragePrice . "元,订单号:" . $order['order_id'];
                         $res = UserBill::income('推荐奖', $spuser['uid'], 'now_money', 'brokerage', $sp_brokeragePrice, $order['id'], $balance, $mark, 1);
                         User::where('uid', $spuser['uid'])->inc('brokerage_price', $sp_brokeragePrice)->update();
                     }

+ 3 - 4
config/upload.php

@@ -2,16 +2,15 @@
 // +----------------------------------------------------------------------
 // | 上传配置
 // +----------------------------------------------------------------------
-
 return [
     //默认上传模式
     'default' => 'local',
     //上传文件大小
-    'filesize' => 2097152,
+    'filesize' => 209715200,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4','apk'],
     //上传文件类型
-    'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg'],
+    'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg','application/vnd.android.package-archive'],
     //驱动模式
     'stores' => [
         //本地上传配置

+ 2 - 0
gp.txt

@@ -0,0 +1,2 @@
+
+/www/wwwroot/gp.liuniu946.com/app/models/store/StoreGp.php--127

+ 2 - 2
job.txt

@@ -1,2 +1,2 @@
-{"id":745,"order_id":"wx164708498060055368","uid":834,"real_name":"\u9648\u82f1\u667a","user_phone":"15558571949","user_address":"\u6d59\u6c5f\u7701 \u53f0\u5dde\u5e02 \u6912\u6c5f\u533a \u9648\u82f1\u667a","cart_id":[857],"freight_price":"0.00","total_num":1,"total_price":"3000.00","total_postage":"0.00","pay_price":"3000.00","pay_postage":"0.00","deduction_price":"0.00","coupon_id":0,"coupon_price":"0.00","paid":0,"pay_time":null,"pay_type":"yue","add_time":1647084980,"status":0,"refund_status":0,"refund_reason_wap_img":null,"refund_reason_wap_explain":null,"refund_reason_time":null,"refund_reason_wap":null,"refund_reason":null,"refund_price":"0.00","delivery_name":null,"delivery_type":null,"delivery_id":null,"gain_integral":"0.00","use_integral":"0.00","back_integral":null,"mark":"","is_del":0,"unique":"fac486d947d8d9c6fdf8e6544b505b3f","remark":null,"mer_id":0,"is_mer_check":0,"combination_id":0,"pink_id":0,"cost":"0.00","seckill_id":0,"bargain_id":0,"verify_code":"","store_id":0,"shipping_type":1,"clerk_id":0,"is_channel":1,"is_remind":0,"is_system_del":0,"is_gp":1,"out_amount":"6000.00","recommend":"200.00","team":"200.00","is_integral":0}
-{"p_no":227,"no_path":"1,3,8,25,76,227,681","gp_id":57,"send":0,"info":{"id":445,"uid":346,"order_id":234,"price":"3000.00","p_no":76,"no":227,"add_time":1645438823,"status":0,"no_path":"1,3,8,25,76,227","cts":1,"team_cts":0,"send":0}}
+{"id":746,"order_id":"wx164714989197442109","uid":836,"real_name":"1356666620","user_phone":"13566662620","user_address":"\u6d59\u6c5f\u7701 \u53f0\u5dde\u5e02 \u6912\u6c5f\u533a \u4e1c\u6d77\u5927\u9053400\u53f7","cart_id":[859],"freight_price":"0.00","total_num":1,"total_price":"3000.00","total_postage":"0.00","pay_price":"3000.00","pay_postage":"0.00","deduction_price":"0.00","coupon_id":0,"coupon_price":"0.00","paid":0,"pay_time":null,"pay_type":"yue","add_time":1647149891,"status":0,"refund_status":0,"refund_reason_wap_img":null,"refund_reason_wap_explain":null,"refund_reason_time":null,"refund_reason_wap":null,"refund_reason":null,"refund_price":"0.00","delivery_name":null,"delivery_type":null,"delivery_id":null,"gain_integral":"0.00","use_integral":"0.00","back_integral":null,"mark":"","is_del":0,"unique":"f028aae631ca558bf63144ad7efbd595","remark":null,"mer_id":0,"is_mer_check":0,"combination_id":0,"pink_id":0,"cost":"0.00","seckill_id":0,"bargain_id":0,"verify_code":"","store_id":0,"shipping_type":1,"clerk_id":0,"is_channel":1,"is_remind":0,"is_system_del":0,"is_gp":1,"out_amount":"6000.00","recommend":"200.00","team":"200.00","is_integral":0}
+{"p_no":227,"no_path":"1,3,8,25,76,227,682","gp_id":57,"send":1,"info":{"id":445,"uid":346,"order_id":234,"price":"3000.00","p_no":76,"no":227,"add_time":1645438823,"status":0,"no_path":"1,3,8,25,76,227","cts":2,"team_cts":0,"send":0}}

+ 1 - 0
route/api/route.php

@@ -30,6 +30,7 @@ Route::post('register/reset', 'AuthController/reset')->name('registerReset')
 Route::any('wechat/serve', 'wechat.WechatController/serve');//公众号服务
 Route::any('wechat/notify', 'wechat.WechatController/notify');//公众号支付回调
 Route::any('routine/notify', 'wechat.AuthController/notify');//小程序支付回调
+Route::get('version', 'PublicController/app_version')->name('version')->middleware(\app\http\middleware\AllowOriginMiddleware::class);
 
 //管理员订单操作类
 Route::group(function () {