likang

catch/api/controller/Api.php

@@ -355,7 +355,6 @@ class Api extends CatchController
 // //{“mac”:”013560”,”data”:[{“label”:”258962f”,”time”:1682317268,”dirt”:2},{“label”:”258962f”,”time”:1682317268,”dirt”:1}]
 //             }
 
-<<<<<<< HEAD
     //打印日志
     public function temporary_label_log(){
         $redis=Cache::store('redis')->handler();
@@ -421,7 +420,6 @@ class Api extends CatchController
   }
 
 
-=======
     //消息处理
     public function handleMessage($text, $mac, $time, $ues_redis){
         $EXP_TIME = 20;
@@ -635,7 +633,6 @@ class Api extends CatchController
     // $url="http://47.114.185.186:8115/api/accessReport";
     // $url_res= curl_http_post(json_encode($url_data),$url,false);
     // debug_log("InAndOUT","远程返回结果".$url_res);
->>>>>>> f98e793d516ef9dc45059709b7d648d9df5aa4e5
 
     public function test(){
         try{

catch/api/route.php

@@ -28,15 +28,10 @@ $router->post('api/report', '\catchAdmin\api\controller\Api@report');
 $router->get('api/deleteHistory', '\catchAdmin\api\controller\Api@deleteHistory');
 $router->get('api/test', '\catchAdmin\api\controller\Api@test');
 $router->get('api/redis', '\catchAdmin\api\controller\Api@redis_to_mysql');
-<<<<<<< HEAD
 $router->get('api/clear_redis', '\catchAdmin\api\controller\Api@clear_redis');
 //打印日志
 $router->get('api/temporary_label_log', '\catchAdmin\api\controller\Api@temporary_label_log');
-
-
-=======
 $router->get('api/redis_parea', '\catchAdmin\api\controller\Api@redis_to_mysql_parea');
->>>>>>> f98e793d516ef9dc45059709b7d648d9df5aa4e5
 
 //更新软件版本测试
 //$router->get('api/detectionVersion', '\catchAdmin\api\controller\Api@detectionVersion');