修复语法问题...

This reverts commit de27a23b4f.

app/agent/controller/Index.php

@@ -71,19 +71,11 @@ class Index
         $user_model = new UserModel();
         $is_exit = $user_model->getOne(['Phone' => $phone]);
         if($is_exit) {
-            if ($is_exit['is_verify'] == 0) {
-                $data_user_old = [
-                    'LoginCode' => $is_exit['LoginCode'].'-del',
-                    'Phone' => $is_exit['Phone'].'-del',
-                ];
-
-                $user_model->updateOne(['Id'=>$is_exit['Id']],$data_user_old);
-            }
-            // $return_data = [
-            //     'code' => 0,
-            //     'msg' => '用户已经存在'
-            // ];
-            // echo json_encode($return_data);die;
+            $return_data = [
+                'code' => 0,
+                'msg' => '用户已经存在'
+            ];
+            echo json_encode($return_data);die;
         }
 
 
@@ -214,105 +206,6 @@ class Index
         die;
     }
 
-    //推广用户注册
-    public function apiregister()
-    {
-        $data = $_GET;
-        // dump($data);die;
-        
-        unset($data['s']);
-        $data['LoginCode'] = trim($data['LoginCode']);
-
-        if(empty($data['LoginCode'])){
-            $info = [
-                'Code' => 10003,
-                'Data' => '',
-                'Message' => '账号为空',
-            ];
-            echo json_encode($info);
-            die;
-        }
-        //----
-
-        if(empty($data['agent_id'])){
-            $info = [
-                'Code' => 10003,
-                'Data' => '',
-                'Message' => '代理id错误',
-            ];
-            echo json_encode($info);
-            die;
-        }
-
-        $data['agent_id'] = base64_decode($data['agent_id']);
-
-        if ($data['agent_id']<10000) {
-            $info = [
-                'Code' => 10003,
-                'Data' => '',
-                'Message' => '代理id错误',
-            ];
-            echo json_encode($info);
-            die;
-        }
-        // dump($data);die;
-
-        $data['Phone'] = $data['LoginCode'];
-        $data['TenantId'] = 0;
-        $data['Enabled'] = 1;
-        $data['UpdateTime'] = date('Y-m-d H:i:s',time());
-        $data['CreateTime'] = date('Y-m-d H:i:s',time());
-        $data['CreateType'] = 4;
-        $data['ProductAccountCount'] = 0;
-        $data['ExpiredProductAccountCount'] = 0;
-        $data['RestAmount'] = 0;
-        $data['ConsumeAmount'] = 0;
-        $data['DeleteTag'] = 0;
-        $data['UseTestCount'] = 0;
-        $data['Sex'] = 0;
-        $data['Wx'] = '';
-        $data['QQ'] = '';
-        $data['LastLoginDate'] = date('Y-m-d H:i:s',time());
-        $data['Password'] = empty($data['Password'])?cToMd5('123568'):cToMd5(trim($data['Password']));
-
-        $user_model = new UserModel;
-        $data['ManagerId'] = 0;
-
-        $has_user = $user_model->isExit("LoginCode='".$data['LoginCode']."' or Phone='".$data['Phone']."' or TaoBao='".$data['Phone']."'");
-        if ($has_user){
-            if ($has_user['is_verify'] == 0) {
-                $data_user_old = [
-                    'LoginCode' => $has_user['LoginCode'].'-del',
-                    'Phone' => $has_user['Phone'].'-del',
-                ];
-
-                $user_model->updateOne(['Id'=>$has_user['Id']],$data_user_old);
-            } else {
-                $info = [
-                    'Code' => 20000,
-                    'Data' => '',
-                    'Message' => '该账号或者手机号被注册了',
-                ];
-                echo json_encode($info);
-                die;
-            }
-            
-        }
-
-        if ($user_model->add($data)) {
-            $info = [
-                'Code' => 10000,
-                'Data' => '',
-                'Message' => '该账号注册成功！',
-            ];
-            echo json_encode($info);
-            die;
-        }
-        die;
-
-
-    }
-
    private function getCred(){
         $ak = "JDC_A3B38E573D7404F976472FB42F52";
         $sk = "C9BAE98F49B42DA2DC02868A75AA3AD8";

app/http/controller/Order.php

@@ -422,7 +422,6 @@ class Order extends Controller
                                 'code'=>-8,
                                 'data' => '非法参数',
                                 'msg' => '请求后台失败，请联系客服！'
-//                                'submsg' => $http_order_data->m
                             ];
                             return $info;
                         } else {
@@ -474,4 +473,4 @@ class Order extends Controller
 
 
 
-}
+}

app/jinyou/controller/Jinyoujt.php

@@ -118,8 +118,8 @@ class Jinyoujt extends Controller
         }
 
         //判断账号是否存在
-        $timezone = new \DateTimeZone('Asia/Shanghai');
-        $datetime = new \DateTime('now', $timezone); // 确保是东八区时间
+        $timezone = new DateTimeZone('Asia/Shanghai');
+        $datetime = new DateTime('now', $timezone); // 确保是东八区时间
         $account_result = $product_account->getCount([
             'ProductId' => $package_info['ProductId'],
             'Account' => $request_data['account'],
@@ -289,7 +289,7 @@ class Jinyoujt extends Controller
 
                         $score_data = [
                             'agent_id' => $order_info['agent_id'],
-                            'order_id' => isset($order_info['Id'])?$order_info['Id']:0,
+                            'order_id' => $order_info['Id'],
                             'score_type' => 1,
                             'score_value' => $score_money,
                             'remark' => "客户购买产品".$order_info['Accounts'],

app/order/controller/CashOutAdmin.php

@@ -202,7 +202,7 @@ class CashOutAdmin extends Controller
             }
         }
         $cash = new CashMoedl;
-        $list = $cash->search($where, '*', 'id desc', '100', $where_str);
+        $list = $cash->search($where, '*', 'id desc', '10000', $where_str);
         //提现状态
         $status = ['待处理', '同意', '拒绝'];
         foreach ($list as &$v) {

fastphp/Fastphp.php

@@ -67,16 +67,6 @@ class Fastphp
         //删除前后的/
         $url = trim($url, '/');
 
-	
-        //处理提交过来的参数
-        if (isset($_GET['s'])) {
-            unset($_GET['s']);
-        }
-        $get_data = json_encode($_GET).json_encode($_POST).file_get_contents("php://input");
-        if ((stripos($get_data, 'substring') !== false)||(stripos($get_data, 'DUMPFILE') !== false)||(stripos($get_data, 'EXECUTE') !== false)||(stripos($get_data, 'TO_BASE64') !== false)||(stripos($get_data, 'insert') !== false)||(stripos($get_data, 'select') !== false)||(stripos($get_data, 'drop') !== false)||(stripos($get_data, 'grant') !== false)||(stripos($get_data, 'alert') !== false)||(stripos($get_data, 'UNION') !== false)||(stripos($get_data, 'OUTFILE') !== false)) {
-            die;
-        }
-
         if ($url) {
             //使用 / 分割
             $urlArray = explode('/', $url);
@@ -95,11 +85,9 @@ class Fastphp
         //判断控制器和操作是否存在
         $controller = 'app\\' . $controllerName;
         if (!class_exists($controller)) {
-            die;
             exit($controller . '控制器不存在！');
         }
         if (!method_exists($controller, $actionName)) {
-            die;
             exit($actionName . '方法不存在！');
         }
 

script/linedata/get_line_list.php

@@ -172,7 +172,7 @@ if ($liebao) {
 // }
 
 ///动态
-$url = 'http://int.lhok.net:8000/lineapi_admin1.php?secretId=201000018&secretKey=13239c30a2cb41fe1bc1fa129de2cc5c';
+$url = 'http://int.linghangsoft.net:8000/sysadmin/useradmin/lineapi_admin1.php?secretId=108006113&secretKey=87085a351a64c116df09ebc07d5781sf';
 $yunniu = json_decode(file_get_contents($url), true);