景龙 / gangjuren · 提交

转到一个项目

作者 王晓刚
提交 164e874ea75bb96910fa5a29802a9b9d998e2299 2 个父辈 602e5bc6 971b02cb

Merge branch 'master' of http://114.215.101.231:8099/jinglong/gangjuren into wxg

内嵌 并排对比
正在显示 4 个修改的文件 包含 172 行增加 和 176 行删除
... ... @@ -80,11 +80,7 @@ class App extends Api
if(!$result) {
$this->error('系统繁忙，请稍后再试');
}
$request_arr = [
'成功',
$request_data
];
$this->success($request_arr);
$this->success('成功', $request_data);
} else {
$this->error('非法请求');
}
... ... @@ -147,11 +143,7 @@ class App extends Api
];
$request_data = $equipment_model->where($where)->select();
$request_data = collection($request_data)->toArray();
$request_arr = [
'成功',
$request_data
];
$this->success($request_arr);
$this->success('成功', $request_data);
} else {
$this->error('非法请求');
}
... ... @@ -420,7 +412,7 @@ class App extends Api
curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在
curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器
// curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器
curl_setopt($curl, CURLOPT_POST, true); // 发送一个常规的Post请求
curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包
//curl_setopt($curl, CURLOPT_TIMEOUT, 120); // 设置超时限制防止死循环
... ...
... ... @@ -36,169 +36,4 @@ return array (
'mail_verify_type' => '2',
'mail_from' => '10000@qq.com',
'raw' => [
'app_id' => 'wx501cda0ef4db38a2',//客户app_id
'secret' => '7a5783b501fc3bab1bf6087303358199',//客户秘钥
],
//七牛云域名
'host' => 'http://jinglong.springchunjia.cn',
//分页限制数量
'page_limit' => 10,
'user' => [
'rule' => [
'code' => 'require',
'nickname' => 'require',
'avatar' => 'require',
],
'msg' => [
'name.require' => '昵称不能为空',
'code.require' => 'code码不能为空',
'avatar' => '头像不能为空',
]
],
'binkMobile' => [
'rule' => [
'mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
],
'msg' => [
'mobile.require' => '手机号不能为空',
'mobile' => '手机号格式不正确',
]
],
'id' => [
'rule' => [
'id' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
]
],
//修改用户
'person' => [
'rule' => [
'username' => 'require',
],
'msg' => [
'username.require' => '姓名不能为空',
]
],
//套餐列表
'meal' => [
'rule' => [
'type' => 'require|number',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
]
],
//支付
'pay' => [
'rule' => [
'openid' => 'require',
'type' => 'require|number',
'm_id' => 'require|number',
],
'msg' => [
'openid.require' => 'openid不能为空',
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
'm_id.require' => '套餐id不能为空',
'm_id.number' => '套餐id必须为数字',
]
],
//支付
'pay_status' => [
'rule' => [
'type' => 'require|number',
'pay_order_sn' => 'require',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
'pay_order_sn.require' => '支付订单号不能为空',
]
],
//详情
'get_id' => [
'rule' => [
'id' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
]
],
//订单详情
'get_id_type' => [
'rule' => [
'id' => 'require|number',
'type' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
]
],
//申请发票
'apply_invoice' => [
'rule' => [
'type' => 'require|number',
'payable' => 'require',
'paragraph' => 'require',
'mark' => 'require',
'address' => 'require',
'mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
'open_bank' => 'require',
'open_account' => ['require','regex'=>'/^(\d{16}|\d{19})$/'],
'money' => 'require',
'user_name' => 'require',
'user_mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
'user_address' => 'require',
],
'msg' => [
'type.require' => '发票类型不能为空',
'type.number' => '发票类型必须为数字',
'payable.require' => '发票抬头不能为空',
'paragraph.require' => '发票税号不能为空',
'mark.require' => '备注不能为空',
'address.require' => '地址不能为空',
'mobile.require' => '电话不能为空',
'mobile' => '电话格式不正确',
'open_bank.require' => '开户行不能为空',
'open_account.require' => '开户行账号不能为空',
'open_account' => '开户行账号格式不正确',
'money.require' => '发票金额不能为空',
'user_name.require' => '收件人姓名不能为空',
'user_mobile.require' => '收件人电话不能为空',
'user_mobile' => '收件人电话格式不正确',
'user_address.require' => '收件人地址不能为空',
]
],
'pages' => [
'rule' => [
'page' => 'require|number',
],
'msg' => [
'page.require' => '页码不能为空',
'page.number' => '页码必须是数字',
]
],
//消费记录
'type_pages' => [
'rule' => [
'type' => 'require|number',
'page' => 'require|number',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须是数字',
'page.require' => '页码不能为空',
'page.number' => '页码必须是数字',
]
],
);
\ No newline at end of file
... ...
<?php
return array(
'raw' => [
'app_id' => 'wx501cda0ef4db38a2',//客户app_id
'secret' => '7a5783b501fc3bab1bf6087303358199',//客户秘钥
],
//七牛云域名
'host' => 'http://jinglong.springchunjia.cn',
//分页限制数量
'page_limit' => 10,
'user' => [
'rule' => [
'code' => 'require',
'nickname' => 'require',
'avatar' => 'require',
],
'msg' => [
'name.require' => '昵称不能为空',
'code.require' => 'code码不能为空',
'avatar' => '头像不能为空',
]
],
'binkMobile' => [
'rule' => [
'mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
],
'msg' => [
'mobile.require' => '手机号不能为空',
'mobile' => '手机号格式不正确',
]
],
'id' => [
'rule' => [
'id' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
]
],
//修改用户
'person' => [
'rule' => [
'username' => 'require',
],
'msg' => [
'username.require' => '姓名不能为空',
]
],
//套餐列表
'meal' => [
'rule' => [
'type' => 'require|number',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
]
],
//支付
'pay' => [
'rule' => [
'openid' => 'require',
'type' => 'require|number',
'm_id' => 'require|number',
],
'msg' => [
'openid.require' => 'openid不能为空',
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
'm_id.require' => '套餐id不能为空',
'm_id.number' => '套餐id必须为数字',
]
],
//支付
'pay_status' => [
'rule' => [
'type' => 'require|number',
'pay_order_sn' => 'require',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
'pay_order_sn.require' => '支付订单号不能为空',
]
],
//详情
'get_id' => [
'rule' => [
'id' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
]
],
//订单详情
'get_id_type' => [
'rule' => [
'id' => 'require|number',
'type' => 'require|number',
],
'msg' => [
'id.require' => 'id不能为空',
'id.number' => 'id必须为数字',
'type.require' => '类型不能为空',
'type.number' => '类型必须为数字',
]
],
//申请发票
'apply_invoice' => [
'rule' => [
'type' => 'require|number',
'payable' => 'require',
'paragraph' => 'require',
'mark' => 'require',
'address' => 'require',
'mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
'open_bank' => 'require',
'open_account' => ['require','regex'=>'/^(\d{16}|\d{19})$/'],
'money' => 'require',
'user_name' => 'require',
'user_mobile' => 'require|regex:/^1[3-8]{1}[0-9]{9}$/',
'user_address' => 'require',
],
'msg' => [
'type.require' => '发票类型不能为空',
'type.number' => '发票类型必须为数字',
'payable.require' => '发票抬头不能为空',
'paragraph.require' => '发票税号不能为空',
'mark.require' => '备注不能为空',
'address.require' => '地址不能为空',
'mobile.require' => '电话不能为空',
'mobile' => '电话格式不正确',
'open_bank.require' => '开户行不能为空',
'open_account.require' => '开户行账号不能为空',
'open_account' => '开户行账号格式不正确',
'money.require' => '发票金额不能为空',
'user_name.require' => '收件人姓名不能为空',
'user_mobile.require' => '收件人电话不能为空',
'user_mobile' => '收件人电话格式不正确',
'user_address.require' => '收件人地址不能为空',
]
],
'pages' => [
'rule' => [
'page' => 'require|number',
],
'msg' => [
'page.require' => '页码不能为空',
'page.number' => '页码必须是数字',
]
],
//消费记录
'type_pages' => [
'rule' => [
'type' => 'require|number',
'page' => 'require|number',
],
'msg' => [
'type.require' => '类型不能为空',
'type.number' => '类型必须是数字',
'page.require' => '页码不能为空',
'page.number' => '页码必须是数字',
]
],
);
\ No newline at end of file
... ...
此 diff 太大无法显示。