diff --git a/agent/admin/controllers/auto/Config.php b/agent/admin/controllers/auto/Config.php index 73bcf64d..7edc8ad7 100644 --- a/agent/admin/controllers/auto/Config.php +++ b/agent/admin/controllers/auto/Config.php @@ -95,7 +95,7 @@ class Config extends BaseController $row = $this->area_model->get(['county_id' => $adcode]); if ($row) { $data = [ - 'provinceId' => $row['province_id'] . '000', + 'provinceId' => $row['province_id'], 'provinceName' => $row['province_name'], 'cityId' => $row['city_id'], 'cityName' => $row['city_name'], diff --git a/agent/admin/controllers/auto/Visit.php b/agent/admin/controllers/auto/Visit.php new file mode 100644 index 00000000..ad6f640f --- /dev/null +++ b/agent/admin/controllers/auto/Visit.php @@ -0,0 +1,28 @@ +load->model('agent/visit/visit_log_model'); + } + + public function index_post() + { + $params = $this->input_param(); + $data = [ + 'uid' => $this->userId, + 'taskName' => $params['taskName'] ?: '', + 'params' => $params['params'] ? json_encode($params['params'], JSON_UNESCAPED_UNICODE) : '', + 'url' => $params['url'] ?: '', + 'ip' => $_SERVER['REMOTE_ADDR'], + 'day' => date('Y-m-d'), + 'createTime' => date('Y-m-d H:i:s'), + ]; + $req = $this->visit_log_model->addDataPushQueue($data); + $this->return_response(); + } +} \ No newline at end of file diff --git a/api/controllers/plan/Plan.php b/api/controllers/plan/Plan.php index c1cd9292..54ef78a0 100644 --- a/api/controllers/plan/Plan.php +++ b/api/controllers/plan/Plan.php @@ -40,6 +40,7 @@ class Plan extends CI_Controller $plan[] = array('url' => base_url(array('plan', 'agent/commission', 'bizClues')), 'interval' => 1);//线索分佣 $plan[] = array('url' => base_url(array('plan', 'agent/commission', 'orderSubsidy')), 'interval' => 1);//订单完结分佣 + $plan[] = array('url' => base_url(array('plan', 'agent/visit', 'index')), 'interval' => 1); //访问日志入库 $plan[] = array('url' => base_url(array('plan', 'report', 'index')), 'interval' => 20); //门店日报 diff --git a/api/controllers/plan/agent/Visit.php b/api/controllers/plan/agent/Visit.php new file mode 100644 index 00000000..c00280bc --- /dev/null +++ b/api/controllers/plan/agent/Visit.php @@ -0,0 +1,20 @@ +load->model('agent/visit/visit_log_model'); + $this->visit_log_model->set_db('agentdb'); + } + + /* + * 访问日志入库 + */ + public function index() + { + $this->visit_log_model->popQueue(); + } + +} \ No newline at end of file diff --git a/common/models/agent/visit/Visit_log_model.php b/common/models/agent/visit/Visit_log_model.php new file mode 100644 index 00000000..adb87e73 --- /dev/null +++ b/common/models/agent/visit/Visit_log_model.php @@ -0,0 +1,60 @@ +table_name, 'default'); + } + + /** + * 添加数据到队列 + * @param $data + * @return false + */ + public function addDataPushQueue($data) + { + if (!$data) { + return false; + } + $redis = load_cache(); + return $redis->push(self::QUEUE_NAME, $data); + } + + /** + * 出队列 + * @param $limit + * @return false|mixed + */ + public function popQueue($limit = 50) + { + $redis = load_cache(); + $i = 0; + $addData = []; + for ($i; $i < $limit; $i++) { + $data = $redis->pop(self::QUEUE_NAME, $limit); + if (!$data) { + break; + } + $addData[] = [ + 'uid' => $data->uid ?: 0, + 'taskName' => $data->taskName ?: '', + 'params' => $data->params ? $data->params : json_encode([]), + 'url' => $data->url ?: '', + 'ip' => $data->ip ?: '', + 'day' => $data->day ?: date('Y-m-d'), + 'createTime' => $data->createTime ?: time(), + ]; + } + if ($addData) { + $req = $this->add_batch($addData); + return $req; + } + return false; + } +}