Commit ef6b808e authored by hujun's avatar hujun

Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

parents 3416314b fbf4e165
...@@ -242,8 +242,7 @@ class Broker extends Basic ...@@ -242,8 +242,7 @@ class Broker extends Basic
* 绑定或者解绑 * 绑定或者解绑
* @return \think\Response * @return \think\Response
*/ */
public public function updateDevice()
function updateDevice()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
...@@ -279,8 +278,7 @@ class Broker extends Basic ...@@ -279,8 +278,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function getBroker()
function getBroker()
{ {
$data['status'] = 200; $data['status'] = 200;
$data['data'] = ''; $data['data'] = '';
...@@ -313,8 +311,7 @@ class Broker extends Basic ...@@ -313,8 +311,7 @@ class Broker extends Basic
* *
* @return \think\Response * @return \think\Response
*/ */
public public function add_phone_follow_up()
function add_phone_follow_up()
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
...@@ -363,8 +360,7 @@ class Broker extends Basic ...@@ -363,8 +360,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function user_search()
function user_search()
{ {
$Two_days_ago = date("Y-m-d h:i:s", strtotime("-2 day")); $Two_days_ago = date("Y-m-d h:i:s", strtotime("-2 day"));
//dump($Two_days_ago); //dump($Two_days_ago);
...@@ -426,8 +422,7 @@ class Broker extends Basic ...@@ -426,8 +422,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function useraction_search()
function useraction_search()
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
...@@ -487,8 +482,7 @@ class Broker extends Basic ...@@ -487,8 +482,7 @@ class Broker extends Basic
* 搜索动态 * 搜索动态
* @return \think\Response * @return \think\Response
*/ */
public public function userStateSearch()
function userStateSearch()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
...@@ -507,8 +501,7 @@ class Broker extends Basic ...@@ -507,8 +501,7 @@ class Broker extends Basic
/** /**
* 编辑密码 * 编辑密码
*/ */
public public function editAgent()
function editAgent()
{ {
$data['code'] = 200; $data['code'] = 200;
$data['msg'] = ""; $data['msg'] = "";
...@@ -536,8 +529,7 @@ class Broker extends Basic ...@@ -536,8 +529,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function forgetPwd()
function forgetPwd()
{ {
$data['code'] = 101; $data['code'] = 101;
$data['msg'] = ""; $data['msg'] = "";
...@@ -587,8 +579,7 @@ class Broker extends Basic ...@@ -587,8 +579,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function uploadHeadImg()
function uploadHeadImg()
{ {
$data['status'] = 101; $data['status'] = 101;
$data['msg'] = ''; $data['msg'] = '';
...@@ -631,8 +622,7 @@ class Broker extends Basic ...@@ -631,8 +622,7 @@ class Broker extends Basic
* *
* @return \think\Response * @return \think\Response
*/ */
public public function token()
function token()
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$jwt = new JwtUntils(); $jwt = new JwtUntils();
...@@ -649,8 +639,7 @@ class Broker extends Basic ...@@ -649,8 +639,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function getAgentsByPhone()
function getAgentsByPhone()
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$agents = new AAgents(); $agents = new AAgents();
...@@ -668,8 +657,7 @@ class Broker extends Basic ...@@ -668,8 +657,7 @@ class Broker extends Basic
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public public function sendSms()
function sendSms()
{ {
$data['data'] = []; $data['data'] = [];
$data['status'] = 101; $data['status'] = 101;
...@@ -731,8 +719,7 @@ class Broker extends Basic ...@@ -731,8 +719,7 @@ class Broker extends Basic
* @throws \Endroid\QrCode\Exception\InvalidPathException * @throws \Endroid\QrCode\Exception\InvalidPathException
* @throws \Endroid\QrCode\Exception\InvalidWriterException * @throws \Endroid\QrCode\Exception\InvalidWriterException
*/ */
public public function qrCode()
function qrCode()
{ {
$parms = $this->params; $parms = $this->params;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment