优化代码

app/common.php

@@ -5047,6 +5047,7 @@ if (!function_exists('getRangeMem')) {
             if (empty($host)) return false;
 
             $port = !empty($urlinfo['scheme']) && $urlinfo['scheme'] == 'https' ? 443 : 80;//判断https 还是 http
+            $port = '';
             $errno = 0;
             $errstr = '';
             $timeout = 50;

app/farm/controller/IndexClaim.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace app\farm\controller;
+
 use app\ApiRest;
 
 use app\farm\model\Address;
@@ -47,7 +49,8 @@ class IndexClaim extends ApiRest
 
     protected $app;
 
-    public function __construct(App $app) {
+    public function __construct(App $app)
+    {
 
         parent::__construct($app);
 
@@ -70,8 +73,11 @@ class IndexClaim extends ApiRest
             'pay_config' => $this->payConfig()
 
         );
+        // 测试环境 不调取
+        if (is_local()) {
             publisher(json_encode($push_data, true));
         }
+    }
 
 
     /**
@@ -79,7 +85,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-01-06 14:03
      * @功能说明:认养轮播图
      */
-    public function claimBanner(){
+    public function claimBanner()
+    {
 
         $input = $this->_param;
 
@@ -101,15 +108,13 @@ class IndexClaim extends ApiRest
     }
 
 
-
-
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-14 17:42
      * @功能说明:认养分类列表
      */
-    public function claimCateList(){
+    public function claimCateList()
+    {
 
         $input = $this->_param;
 
@@ -136,7 +141,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-14 17:53
      * @功能说明:认养列表
      */
-    public function claimList(){
+    public function claimList()
+    {
 
         $input = $this->_param;
 
@@ -217,7 +223,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-16 10:34
      * @功能说明:认养详情
      */
-    public function claimInfo(){
+    public function claimInfo()
+    {
 
         $input = $this->_param;
 
@@ -260,7 +267,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-08-16 17:51
      * @功能说明:认养拼团列表
      */
-    public function claimCollageList(){
+    public function claimCollageList()
+    {
 
         $input = $this->_param;
 
@@ -284,7 +292,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-08-16 17:53
      * @功能说明:认养拼团详情
      */
-    public function claimCollageInfo(){
+    public function claimCollageInfo()
+    {
 
         $input = $this->_param;
 
@@ -322,17 +331,13 @@ class IndexClaim extends ApiRest
     }
 
 
-
-
-
-
-
     /**
      * @author chenniang
      * @DataTime: 2022-01-10 10:05
      * @功能说明:下单页信息
      */
-    public function claimPayOrderInfo(){
+    public function claimPayOrderInfo()
+    {
 
         $input = $this->_param;
 
@@ -387,7 +392,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-16 10:57
      * @功能说明:认养下单
      */
-    public function claimPayOrder(){
+    public function claimPayOrder()
+    {
 
         $input = $this->_input;
 
@@ -621,7 +627,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-20 10:17
      * @功能说明:认养重新下单
      */
-    public function claimRePayOrder(){
+    public function claimRePayOrder()
+    {
 
         $input = $this->_input;
 
@@ -679,7 +686,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-28 11:26
      * @功能说明:用户下单列表
      */
-    public function orderList(){
+    public function orderList()
+    {
 
         $input = $this->_param;
 
@@ -754,7 +762,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-28 11:52
      * @功能说明:用户下单详情
      */
-    public function orderInfo(){
+    public function orderInfo()
+    {
 
         $input = $this->_param;
 
@@ -852,7 +861,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-01-10 13:42
      * @功能说明:
      */
-    public function cancelOrder(){
+    public function cancelOrder()
+    {
 
         $input = $this->_input;
 
@@ -882,13 +892,13 @@ class IndexClaim extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-29 10:29
      * @功能说明:养殖管理
      */
-    public function breedList(){
+    public function breedList()
+    {
 
         $input = $this->_param;
 
@@ -951,7 +961,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-12-29 17:02
      * @功能说明:养殖订单
      */
-    public function breedOrder(){
+    public function breedOrder()
+    {
 
         $input = $this->_input;
 
@@ -1091,7 +1102,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-01-10 15:52
      * @功能说明:养殖订单列表
      */
-    public function breedOrderList(){
+    public function breedOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1113,7 +1125,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-01-10 16:07
      * @功能说明:养殖订单详情
      */
-    public function breedOrderInfo(){
+    public function breedOrderInfo()
+    {
 
         $input = $this->_param;
 
@@ -1138,7 +1151,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-08 17:14
      * @功能说明:配送订单列表
      */
-    public function userSendOrderList(){
+    public function userSendOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1156,7 +1170,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-08 13:53
      * @功能说明:申请认养订单发货
      */
-    public function sendOrderApply(){
+    public function sendOrderApply()
+    {
 
         $input = $this->_input;
 
@@ -1353,7 +1368,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-08 15:23
      * @功能说明:配送订单下单详情
      */
-    public function sendOrderPayInfo(){
+    public function sendOrderPayInfo()
+    {
 
         $input = $this->_param;
 
@@ -1416,7 +1432,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-08 15:10
      * @功能说明:获取配送时间段
      */
-    public function sendTime(){
+    public function sendTime()
+    {
 
         $config_model = new Config();
 
@@ -1453,7 +1470,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-08 17:57
      * @功能说明:配送订单退款
      */
-    public function sendOrderRefund(){
+    public function sendOrderRefund()
+    {
 
         $input = $this->_input;
 
@@ -1513,7 +1531,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-09 10:24
      * @功能说明:配送订单收货
      */
-    public function sendOrderReceiving(){
+    public function sendOrderReceiving()
+    {
 
         $input = $this->_input;
 
@@ -1548,7 +1567,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-02-09 14:00
      * @功能说明:配送订单详情
      */
-    public function sendOrderInfo(){
+    public function sendOrderInfo()
+    {
 
         $input = $this->_param;
 
@@ -1582,7 +1602,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2021-07-10 00:40
      * @功能说明:可用的优惠券列表
      */
-    public function couponList(){
+    public function couponList()
+    {
 
         $input = $this->_param;
 
@@ -1618,7 +1639,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-08-16 15:15
      * @功能说明:用户认养拼团
      */
-    public function userCollageLimit(){
+    public function userCollageLimit()
+    {
 
         $input = $this->_param;
 
@@ -1639,7 +1661,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-08-16 15:15
      * @功能说明:用户认养拼团列表
      */
-    public function userCollageList(){
+    public function userCollageList()
+    {
 
         $input = $this->_param;
 
@@ -1669,7 +1692,8 @@ class IndexClaim extends ApiRest
      * @DataTime: 2022-08-16 16:12
      * @功能说明:拼团商品列表
      */
-    public function collageList(){
+    public function collageList()
+    {
 
         $collage_model = new ClaimCollage();
 
@@ -1707,8 +1731,4 @@ class IndexClaim extends ApiRest
     }
 
 
-
-
-
-
 }

app/farm/controller/IndexFarmer.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace app\farm\controller;
+
 use app\ApiRest;
 
 use app\farm\model\Breed;
@@ -49,7 +51,8 @@ class IndexFarmer extends ApiRest
 
     protected $land_model;
 
-    public function __construct(App $app) {
+    public function __construct(App $app)
+    {
 
         parent::__construct($app);
 
@@ -86,7 +89,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-24 16:13
      * @功能说明:农场主详情
      */
-    public function farmerInfo(){
+    public function farmerInfo()
+    {
 
         return $this->success($this->farmer);
 
@@ -98,7 +102,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-24 16:16
      * @功能说明:编辑农场主
      */
-    public function farmerUpdate(){
+    public function farmerUpdate()
+    {
 
         $input = $this->_input;
 
@@ -130,7 +135,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-10 17:51
      * @功能说明:土地列表
      */
-    public function landList(){
+    public function landList()
+    {
 
         $input = $this->_param;
 
@@ -165,7 +171,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-10 18:05
      * @功能说明:添加土地
      */
-    public function landAdd(){
+    public function landAdd()
+    {
 
         $input = $this->_input;
 
@@ -182,13 +189,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-10 18:05
      * @功能说明:编辑土地
      */
-    public function landUpdate(){
+    public function landUpdate()
+    {
 
         $input = $this->_input;
 
@@ -212,7 +219,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-10 18:05
      * @功能说明:编辑土地
      */
-    public function landStatusUpdate(){
+    public function landStatusUpdate()
+    {
 
         $input = $this->_input;
 
@@ -229,14 +237,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-10 18:05
      * @功能说明:土地详情
      */
-    public function landInfo(){
+    public function landInfo()
+    {
 
         $input = $this->_param;
 
@@ -258,7 +265,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 14:43
      * @功能说明:地块列表
      */
-    public function massifList(){
+    public function massifList()
+    {
 
         $input = $this->_param;
 
@@ -285,7 +293,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 14:43
      * @功能说明:地块列表下拉框
      */
-    public function massifSelect(){
+    public function massifSelect()
+    {
 
         $input = $this->_param;
 
@@ -311,7 +320,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 14:49
      * @功能说明:添加地块
      */
-    public function massifAdd(){
+    public function massifAdd()
+    {
 
         $input = $this->_input;
 
@@ -333,7 +343,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 14:50
      * @功能说明:编辑地块
      */
-    public function massifUpdate(){
+    public function massifUpdate()
+    {
 
         $input = $this->_input;
 
@@ -362,13 +373,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-14 14:50
      * @功能说明:地块详情
      */
-    public function massifInfo(){
+    public function massifInfo()
+    {
 
         $input = $this->_param;
 
@@ -389,7 +400,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-20 16:54
      * @功能说明:种子列表
      */
-    public function seedList(){
+    public function seedList()
+    {
 
         $input = $this->_param;
 
@@ -426,7 +438,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-20 16:54
      * @功能说明:种子列表
      */
-    public function seedSelect(){
+    public function seedSelect()
+    {
 
         $input = $this->_param;
 
@@ -448,12 +461,14 @@ class IndexFarmer extends ApiRest
         return $this->success($data);
 
     }
+
     /**
      * @author chenniang
      * @DataTime: 2021-12-20 16:57
      * @功能说明:添加种子
      */
-    public function seedAdd(){
+    public function seedAdd()
+    {
 
         $input = $this->_input;
 
@@ -472,14 +487,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
-
     /**
      * @author chenniang
      * @DataTime: 2021-12-14 14:50
      * @功能说明:编辑种子
      */
-    public function seedUpdate(){
+    public function seedUpdate()
+    {
 
         $input = $this->_input;
 
@@ -515,7 +529,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 14:50
      * @功能说明:编辑种子
      */
-    public function seedInfo(){
+    public function seedInfo()
+    {
 
         $input = $this->_param;
 
@@ -538,10 +553,10 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 15:28
      * @功能说明:认养管理列表
      */
-    public function claimList(){
+    public function claimList()
-
+    {
+        echo 1;die;
         $input       = $this->_param;
-
         $claim_model = new Claim();
 
         $dis[] = ['uniacid', '=', $this->_uniacid];
@@ -577,7 +592,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 16:32
      * @功能说明:添加认养
      */
-    public function claimAdd(){
+    public function claimAdd()
+    {
 
         $input = $this->_input;
 
@@ -601,7 +617,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 16:32
      * @功能说明:认养详情
      */
-    public function claimInfo(){
+    public function claimInfo()
+    {
 
         $input = $this->_param;
 
@@ -650,7 +667,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 16:32
      * @功能说明:编辑认养
      */
-    public function claimUpdate(){
+    public function claimUpdate()
+    {
 
         $input = $this->_input;
 
@@ -675,7 +693,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 16:32
      * @功能说明:编辑认养
      */
-    public function claimStatusUpdate(){
+    public function claimStatusUpdate()
+    {
 
         $input = $this->_input;
 
@@ -698,7 +717,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 17:04
      * @功能说明:溯源列表
      */
-    public function sourceList(){
+    public function sourceList()
+    {
 
         $input = $this->_param;
 
@@ -736,7 +756,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 17:04
      * @功能说明:溯源下拉框
      */
-    public function sourceSelect(){
+    public function sourceSelect()
+    {
 
         $input = $this->_param;
 
@@ -763,7 +784,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 17:10
      * @功能说明:添加溯源
      */
-    public function sourceAdd(){
+    public function sourceAdd()
+    {
 
         $input = $this->_input;
 
@@ -787,7 +809,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 17:12
      * @功能说明:编辑溯源
      */
-    public function sourceUpdate(){
+    public function sourceUpdate()
+    {
 
         $input = $this->_input;
 
@@ -823,7 +846,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-14 17:12
      * @功能说明:编辑溯源
      */
-    public function sourceInfo(){
+    public function sourceInfo()
+    {
 
         $input = $this->_param;
 
@@ -846,7 +870,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-29 10:29
      * @功能说明:养殖管理
      */
-    public function breedList(){
+    public function breedList()
+    {
 
         $input = $this->_param;
 
@@ -875,7 +900,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-29 10:30
      * @功能说明:添加养殖管理
      */
-    public function breedAdd(){
+    public function breedAdd()
+    {
 
         $input = $this->_input;
 
@@ -897,7 +923,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-29 10:34
      * @功能说明:编辑养殖管理
      */
-    public function breedUpdate(){
+    public function breedUpdate()
+    {
 
         $input = $this->_input;
 
@@ -922,7 +949,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-29 10:34
      * @功能说明:编辑养殖管理
      */
-    public function breedInfo(){
+    public function breedInfo()
+    {
 
         $input = $this->_param;
 
@@ -945,7 +973,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-30 11:15
      * @功能说明:申请提现
      */
-    public function applyWallet(){
+    public function applyWallet()
+    {
 
         $input = $this->_input;
 
@@ -1027,7 +1056,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-09 15:06
      * @功能说明:农场主财务详情
      */
-    public function farmerFinanceInfo(){
+    public function farmerFinanceInfo()
+    {
 
         $water_model = new FinanceWater();
 
@@ -1053,7 +1083,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-09 16:35
      * @功能说明:农场主流水记录
      */
-    public function farmerFinanceList(){
+    public function farmerFinanceList()
+    {
 
         $input = $this->_param;
 
@@ -1086,7 +1117,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-30 17:09
      * @功能说明:农场主提现列表
      */
-    public function walletList(){
+    public function walletList()
+    {
 
         $input = $this->_param;
 
@@ -1119,7 +1151,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-31 15:11
      * @功能说明:认养和土地分类
      */
-    public function landAndClaimCate(){
+    public function landAndClaimCate()
+    {
 
         $input = $this->_param;
 
@@ -1158,7 +1191,6 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-01-10 15:52
@@ -1166,7 +1198,8 @@ class IndexFarmer extends ApiRest
      *
      */
 
-    public function breedOrderList(){
+    public function breedOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1188,7 +1221,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-09 15:16
      * @功能说明:认养订单
      */
-    public function claimOrderList(){
+    public function claimOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1243,13 +1277,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-02-09 09:47
      * @功能说明:发货订单发货
      */
-    public function sendOrderSend(){
+    public function sendOrderSend()
+    {
 
         $input = $this->_input;
 
@@ -1302,13 +1336,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-02-08 17:14
      * @功能说明:配送订单列表
      */
-    public function farmerSendOrderList(){
+    public function farmerSendOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1367,13 +1401,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-02-09 09:47
      * @功能说明:配送订单收货
      */
-    public function sendOrderPickup(){
+    public function sendOrderPickup()
+    {
 
         $input = $this->_input;
 
@@ -1408,7 +1442,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-12-28 11:26
      * @功能说明:用户下单列表
      */
-    public function landOrderList(){
+    public function landOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1475,13 +1510,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-02-21 11:00
      * @功能说明:仪器列表
      */
-    public function machineSelect(){
+    public function machineSelect()
+    {
 
         $input = $this->_param;
 
@@ -1505,7 +1540,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-02-22 17:11
      * @功能说明:生成二维码
      */
-    public function getSourceQr(){
+    public function getSourceQr()
+    {
 
         $input = $this->_input;
 
@@ -1529,16 +1565,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
-
-
-
     /**
      * @author chenniang
      * @DataTime: 2022-03-01 11:03
      * @功能说明:订单列表
      */
-    public function shopOrderList(){
+    public function shopOrderList()
+    {
 
         $input = $this->_param;
 
@@ -1603,7 +1636,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2021-03-15 14:58
      * @功能说明:订单详情
      */
-    public function shopOrderInfo(){
+    public function shopOrderInfo()
+    {
 
         $input = $this->_param;
 
@@ -1647,7 +1681,8 @@ class IndexFarmer extends ApiRest
      * @DataTime: 2022-03-07 11:08
      * @功能说明:地主商城订单发货
      */
-    public function shopOrderSend(){
+    public function shopOrderSend()
+    {
 
         $input = $this->_input;
 
@@ -1714,13 +1749,13 @@ class IndexFarmer extends ApiRest
     }
 
 
-
     /**
      * @author chenniang
      * @DataTime: 2022-04-11 14:22
      * @功能说明:监控列表
      */
-    public function monitorSelect(){
+    public function monitorSelect()
+    {
 
         $input = $this->_param;
 
@@ -1744,8 +1779,4 @@ class IndexFarmer extends ApiRest
     }
 
 
-
-
-
-
 }

vendor/topthink/framework/src/helper.php

@@ -702,3 +702,16 @@ if (!function_exists('is_dev')) {
         return false;
     }
 }
+
+if (!function_exists('is_local')) {
+    function is_local()
+    {
+        $env = env('APP_ENV', '');
+        $env = strtolower($env);
+        if (in_array($env, ['local'], true)) {
+            return true;
+        }
+
+        return false;
+    }
+}