周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 a15a542fc700c8713f586faf897858d555648348 2 个父辈 99476dcf 83b6c703

合并分支 'lyh-server' 到 'master' 

geo设置



查看合并请求 !2370
内嵌 并排对比
正在显示 6 个修改的文件 包含 237 行增加 和 28 行删除
... ... @@ -88,12 +88,21 @@ class GeoQuestionRes extends Command
if ($error_num >= 3) {
continue;
}
if ($platform == 'Google AI Overview') {
// overview 数据结构不确定， 需要单独处理数据
$data = $geo_service->getGooglePlatformResult($question);
$result = $this->dealGoogleData($data);
} else {
$result = $geo_service->getAiPlatformResult($question, $platform);
switch ($platform){
// case 'google_ai_overview':
// // overview 数据结构不确定， 需要单独处理数据
// $data = $geo_service->getGooglePlatformResult($question);
// $result = $this->dealGoogleData($data);
// break;
case 'deep_seek':
$data = $geo_service->getDeepSeekResult($question);
dd($data);
$result = $this->dealDeepSeek($data);
break;
default:
continue;
$result = $geo_service->getAiPlatformResult($question, $platform);
break;
}
if (empty($result['text'])){
goto GET_RESULT;
... ... @@ -109,22 +118,21 @@ class GeoQuestionRes extends Command
$title = array_column(array_column($result['annotations'], 'url_citation'), 'title');
$hit_data = array_merge($url, $title, $hit_data);
}
// 命中关键词和路由
$hit_keyword = $hit_url = [];
$hit = 0;
if (!empty($taskInfo['keywords'])) {
$hit_keyword = $this->getKeywords($taskInfo['keywords'],$hit_data);
if (!empty($hit_keyword)) {
$hit++;
}
$hit_keyword = $this->getKeywords($taskInfo['keywords'],$hit_data);
if (!empty($hit_keyword['keywords'])) {
$hit++;
}
if (!empty($taskInfo['url'])) {
$hit_url = $this->getUrl($taskInfo['url'],$hit_data);
if (!empty($hit_url)) {
$hit++;
}
if(!empty($hit_keyword['keywords_num'])){
$keyword_num = json_encode($hit_keyword['keywords_num'],true);
}
$hit_url = $this->getUrl($taskInfo['url'],$hit_data);
if (!empty($hit_url['url'])) {
$hit++;
}
if (!empty($hit_url['url_num'])) {
$url_num = json_encode($hit_url['url'],true);
}
echo 'MZ-url->'.json_encode($hit_url).PHP_EOL;
// 保存数据结果
$geo_result = $geoResultModel->read(['project_id' => $taskInfo['project_id'],'type' => $taskInfo['type'], 'question_id' => $task_id, 'platform' => $platform, 'question' => $question],['id']);
$save_data = [
... ... @@ -134,16 +142,18 @@ class GeoQuestionRes extends Command
'platform' => $platform,
'question' => $question,
'en_question'=> $en_question,
'keywords' => json_encode($hit_keyword,true),//命中的关键词
'url' => json_encode($hit_url,true),//命中的网址
'text' => json_encode($result,true),
'hit' => $hit,
'keywords' => json_encode($hit_keyword['keywords'] ?? [],true),//命中的关键词
'url' => json_encode($hit_url['url'] ?? [],true),//命中的网址
'text' => json_encode($result ?? [],true),
'hit' => $hit ?? 0,
'keywords_num'=>$keyword_num ?? [],
'url_num'=>$url_num ?? [],
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
];
// echo '当前数据INFO:'.json_encode($save_data,true).PHP_EOL;
if($geo_result === false){
$id= $geoResultModel->insertGetId($save_data);
$geoResultModel->insertGetId($save_data);
}else{
$geoResultModel->edit($save_data, ['id' => $geo_result['id']]);
}
... ... @@ -167,15 +177,18 @@ class GeoQuestionRes extends Command
*/
public function getUrl($urlArr = [],$result_annotations = []){
$url = [];
$url_num = [];
if(!empty($urlArr)){
$str = implode(',',$result_annotations);
foreach ($urlArr as $u_item){
$count = substr_count($result_annotations, $u_item);
$url_num[$u_item] = $count;
if (str_contains($str, $u_item)) {
$url[] = $u_item;
}
}
}
return array_values(array_unique($url));
return ['url'=>$url,'url_num'=>$url_num];
}
/**
... ... @@ -187,15 +200,43 @@ class GeoQuestionRes extends Command
*/
public function getKeywords($keywordArr = [],$result_text = []){
$keywords = [];
$keywords_num = [];
if(!empty($keywordArr) && !empty($result_text)){
$str = implode(',',$result_text);
foreach ($keywordArr as $k_item){
$count = substr_count($result_text, $k_item);
$keywords_num[$k_item] = $count;
if (str_contains($str, $k_item)) {
$keywords[] = $k_item;
}
}
}
return $keywords;
return ['keywords'=>$keywords,'keywords_num'=>$keywords_num];
}
/**
* @remark :整合deepSeek
* @name :requestDeepSeek
* @author :lyh
* @method :post
* @time :2025/7/15 10:58
*/
public function dealDeepSeek($data){
$result = [
'code' => 200,
'model' => 'DeepSeek',
'text' => '',
];
$texts = [];
if(!empty($data['text'])){
array_unshift($texts, $data['text']);
}
if(!empty($data['reasoning_content'])){
array_unshift($texts, $data['reasoning_content']);
}
$text = implode(PHP_EOL, $texts);
$result['text'] = $text;
return $result;
}
/**
... ... @@ -279,6 +320,7 @@ class GeoQuestionRes extends Command
return $task_id;
}
/**
* 输出日志
* @param $message
... ...
... ... @@ -12,6 +12,7 @@ namespace App\Http\Controllers\Aside\Geo;
use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Geo\GeoArticleLogic;
use Illuminate\Http\Request;
/**
* @remark :GEO文章列表数据
... ... @@ -62,11 +63,34 @@ class GeoArticleController extends BaseController
}
/**
* @remark :更新单个数据
* @name :edit
* @author :lyh
* @method :post
* @time :2025/7/15 10:31
*/
public function edit(){
$this->request->validate([
'id'=>'required',
'url'=>'required',
'filename'=>'required',
],[
'id.required' => 'ID不能为空',
'url.required' => '链接不能为空',
'filename.required' => '文件名称不能为空',
]);
$data = $this->logic->editArticle();
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存数据
* @name :save
* @author :lyh
* @method :post
* @time :2025/7/14 17:05
* @param :data->数组（filename：文件名称 url:链接）
* @json :测试数据 {"project_id": 1,"data": [{"url": "/upload/m/file/2023-09/6513d00870e0821127.pdf","filename": "测试文件1"}]}
*/
public function save(){
$this->request->validate([
... ...
... ... @@ -9,8 +9,10 @@
namespace App\Http\Controllers\Aside\Geo;
use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Geo\GeoLinkLogic;
use Illuminate\Http\Request;
/**
* @remark :geo权威新闻（链接数据）
* @name :GeoLinkController
... ... @@ -20,5 +22,80 @@ use App\Http\Controllers\Aside\BaseController;
*/
class GeoLinkController extends BaseController
{
public function __construct(Request $request)
{
parent::__construct($request);
$this->logic = new GeoLinkLogic();
}
/**
* @remark :获取链接数据列表
* @name :lists
* @author :lyh
* @method :post
* @time :2025/7/15 9:14
*/
public function lists(){
$this->request->validate([
'project_id'=>'required',
],[
'project_id.required' => '项目ID不能为空',
]);
$lists = $this->logic->getLinkList($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @remark :获取数据详情
* @name :info
* @author :lyh
* @method :post
* @time :2025/7/15 9:15
*/
public function info(){
$this->request->validate([
'id'=>'required',
],[
'id.required' => 'ID不能为空',
]);
$data = $this->logic->getLinkInfo();
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :保存数据
* @name :save
* @author :lyh
* @method :post
* @time :2025/7/15 9:17
*/
public function save(){
$this->request->validate([
'project_id'=>'required',
'data'=>'required|array'
],[
'project_id.required' => '项目ID不能为空',
'data.required' => '数据详情不能为空',
'data.array' => '数据详情为数组',
]);
$data = $this->logic->saveLink();
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :删除数据
* @name :del
* @author :lyh
* @method :post
* @time :2025/7/15 9:17
*/
public function del(){
$this->request->validate([
'id'=>'required',
],[
'id.required' => 'ID不能为空',
]);
$data = $this->logic->delLink();
$this->response('success',Code::SUCCESS,$data);
}
}
... ...
... ... @@ -41,6 +41,13 @@ class GeoArticleLogic extends BaseLogic
}
$filed = ['*'];
$lists = $this->model->lists($map,$page,$row,$order,$filed);
if(!empty($lists) && !empty($lists['list'])){
foreach ($lists['list'] as $key => $item){
$item['download_url'] = url('a/download_files?path='.$item['url']);
$item['url_link'] = getFileUrl($item['url']);
$lists['list'][$key] = $item;
}
}
return $this->success($lists);
}
... ... @@ -56,10 +63,24 @@ class GeoArticleLogic extends BaseLogic
if($info === false){
$this->fail('当前数据不存在或者已被删除');
}
$info['url'] = getFileUrl($info['url']);
return $this->success($info);
}
/**
* @remark :更新单个数据
* @name :editArticle
* @author :lyh
* @method :post
* @time :2025/7/15 10:29
*/
public function editArticle(){
$this->param['url'] = str_replace_url($this->param['url']);
$this->model->edit($this->param,['id'=>$this->param['id']]);
return $this->success(['id'=>$this->param['id']]);
}
/**
* @remark :保存数据
* @name :saveArticle
* @author :lyh
... ...
... ... @@ -11,7 +11,7 @@ namespace App\Services\Geo;
class GeoService
{
public $api_key = '7yn!We6$&NnVA38bpGy*A@4TQ5iYLJcW';
public $api_key = 'UkzZljFv83Z2qBi5YR1o3f2otAVWtug6';
public $api_url = 'https://api.cmer.com/';
... ... @@ -68,4 +68,34 @@ class GeoService
$url = $url . '?' . http_build_query($param);
return http_get($url, $header);
}
/**
* @remark :请求deepSeek数据
* @name :getDeepSeek
* @author :lyh
* @method :post
* @time :2025/7/15 10:59
*/
public function getDeepSeekResult($content){
$url = $this->api_url . 'v1/chat';
$header = [
'accept: application/json',
'X-CmerApi-Host: llm-chat.p.cmer.com',
'apikey: '.$this->api_key,
'Content-Type: application/json'
];
$message = [
'messages'=>[
[
'content'=>$content,
'role'=>'user'
],
],
'model' => 'deepseek-r1',
"supplier"=> "bailian",
'security_check' => true
];
$data = http_post($url,json_encode($message,true),$header);
return $data;
}
}
... ...
... ... @@ -563,6 +563,21 @@ Route::middleware(['aloginauth'])->group(function () {
Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion');
Route::any('/delGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'delGeoQuestion'])->name('admin.geo_question_delGeoQuestion');
});
//文章列表
Route::prefix('article')->group(function () {
Route::any('/lists', [Aside\Geo\GeoArticleController::class, 'lists'])->name('admin.geo_article_lists');
Route::any('/save', [Aside\Geo\GeoArticleController::class, 'save'])->name('admin.geo_article_save');
Route::any('/edit', [Aside\Geo\GeoArticleController::class, 'edit'])->name('admin.geo_article_edit');
Route::any('/info', [Aside\Geo\GeoArticleController::class, 'info'])->name('admin.geo_article_info');
Route::any('/del', [Aside\Geo\GeoArticleController::class, 'del'])->name('admin.geo_article_del');
});
//权威文章链接
Route::prefix('link')->group(function () {
Route::any('/lists', [Aside\Geo\GeoLinkController::class, 'lists'])->name('admin.geo_link_lists');
Route::any('/save', [Aside\Geo\GeoLinkController::class, 'save'])->name('admin.geo_link_save');
Route::any('/info', [Aside\Geo\GeoLinkController::class, 'info'])->name('admin.geo_link_info');
Route::any('/del', [Aside\Geo\GeoLinkController::class, 'del'])->name('admin.geo_link_del');
});
});
// 任务相关
Route::prefix('task')->group(function () {
... ...