作者 Your Name

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -179,7 +179,12 @@ class LoginController extends BaseController @@ -179,7 +179,12 @@ class LoginController extends BaseController
179 'EventKey' => 'qrscene_global-v6_v6', 179 'EventKey' => 'qrscene_global-v6_v6',
180 'Ticket' => 'gQF27zwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAyWnppdHhWTlRjOEcxTlBpTE5BY2IAAgRjBO9kAwQQDgAA', 180 'Ticket' => 'gQF27zwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAyWnppdHhWTlRjOEcxTlBpTE5BY2IAAgRjBO9kAwQQDgAA',
181 ]; 181 ];
  182 + //查看当前账户是否绑定
  183 + $userModel = new UserModel();
  184 + $info = $userModel->read(['wechat'=>$message->FromUserName]);
  185 + if($info === false){
182 186
  187 + }
183 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND); 188 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
184 >>>>>>> cb4013abb5967a24f5c482c21f3a93a48789077d 189 >>>>>>> cb4013abb5967a24f5c482c21f3a93a48789077d
185 return "<xml> 190 return "<xml>
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Logic\Aside\Project; 3 namespace App\Http\Logic\Aside\Project;
4 4
5 5
  6 +use App\Helper\Common;
6 use App\Http\Logic\Aside\BaseLogic; 7 use App\Http\Logic\Aside\BaseLogic;
7 use App\Models\Project\OnlineCheck; 8 use App\Models\Project\OnlineCheck;
8 use App\Models\Project\Project; 9 use App\Models\Project\Project;
@@ -72,6 +73,7 @@ class OnlineCheckLogic extends BaseLogic @@ -72,6 +73,7 @@ class OnlineCheckLogic extends BaseLogic
72 $projectModel = new Project(); 73 $projectModel = new Project();
73 $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]); 74 $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]);
74 } 75 }
  76 + Common::del_user_cache($projectModel->getTable(),$this->param['id']);
75 return $this->success(); 77 return $this->success();
76 } 78 }
77 } 79 }