作者 李宇航

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

更新推荐供应商



查看合并请求 !1386
... ... @@ -9,7 +9,9 @@
namespace App\Console\Commands\RequestUrlLog;
use App\Helper\FormGlobalsoApi;
use App\Models\Com\RequestUrl;
use App\Models\Domain\DomainInfo;
use App\Models\Project\Project;
use Illuminate\Console\Command;
... ... @@ -40,22 +42,87 @@ class RequestUrlLog extends Command
//获取需要请求的接口
$requestUrlModel = new RequestUrl();
$urlList = $requestUrlModel->list(['status'=>0]);
//随机获取一个项目,需要验证的其他方法
$projectModel = new Project();
$projectInfo = $projectModel->formatQuery(['type'=>2,'delete_status'=>0])->inRandomOrder()->first();
//获取对应项目的域名
$domainModel = new DomainInfo();
$domainInfo = $domainModel->read(['project_id'=>$projectInfo['id']]);
foreach ($urlList as $v){
//需要单独验证的方法
if($v['url'] == 'getMonthInquiry'){
$result = $this->getMonthInquiry($domainInfo['domain'],date('Y-m'), 0);
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
continue;
}
//循环请求设置
if($v['method'] == 'get'){
}else{
$url = $v['url'];
$result = $this->postRequest($url,$v['param']);
echo '执行的url:' . $url . PHP_EOL . '返回的结果:'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
if($v['method'] == 'post'){
$result = $this->postRequest($v['url'],$v['param']);
echo '执行的url:' . $v['url'] . PHP_EOL . '返回的结果:'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
//更新请求结果
$requestUrlModel->edit(['text'=>json_encode($result,true)],['id'=>$v['id']]);
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
continue;
}
}
return true;
}
/**
* @remark :按月统计xunpan
* @name :getMonthInquiry
* @author :lyh
* @method :post
* @time :2025/3/10 14:15
*/
public function getMonthInquiry($url,$month,$is_upgrade = 0){
$url = 'https://'.$url.'/';
$token = md5($url.date("Y-m-d"));
$data = [
'domain' => $url,
'token' => $token,
'source'=> $is_upgrade ? '1,2,3,4,5' : '1,3,5',
'model' => 'month',
'sta_date'=>$month,
];
$queryString = http_build_query($data);
$url = 'https://www.globalso.site/api/external-interface/country_con/15243d63ed5a5738?'.$queryString;
$res = $this->getRequest($url);
return $res;
}
/**
* @remark :http_get请求
* @name :getRequest
* @author :lyh
* @method :post
* @time :2025/3/10 14:35
*/
public function getRequest($url){
$header[] = "content-type: application/json";
$ch1 = curl_init();
$timeout = 0;
curl_setopt($ch1, CURLOPT_URL, $url);
curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch1, CURLOPT_ENCODING, '');
curl_setopt($ch1, CURLOPT_MAXREDIRS, 10);
curl_setopt($ch1, CURLOPT_TIMEOUT, 120);
curl_setopt($ch1, CURLOPT_HTTPHEADER, $header);
curl_setopt($ch1, CURLOPT_CONNECTTIMEOUT, $timeout);
curl_setopt($ch1, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch1, CURLOPT_CUSTOMREQUEST, 'GET');
curl_setopt($ch1, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
$access_txt = curl_exec($ch1);
$total_time = curl_getinfo($ch1, CURLINFO_TOTAL_TIME); // 获取请求总时间
$httpCode = curl_getinfo($ch1, CURLINFO_HTTP_CODE);
if (curl_errno($ch1)) {
curl_error($ch1);
}
curl_close($ch1);
$response = json_decode($access_txt, true);
return ['response' => $response, 'http_code' => $httpCode, 'request_time_ms' => $total_time];
}
/**
* @remark :请求设置
* @name :postRequest
* @author :lyh
... ... @@ -64,12 +131,10 @@ class RequestUrlLog extends Command
*/
public function postRequest($url, $postData)
{
if (empty($header)) {
$header = array(
"Accept: application/json",
"Content-Type:application/json;charset=utf-8",
);
}
$header = array(
"Accept: application/json",
"Content-Type:application/json;charset=utf-8",
);
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
... ... @@ -81,18 +146,15 @@ class RequestUrlLog extends Command
curl_setopt($ch, CURLOPT_AUTOREFERER, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
// 记录请求开始时间
$startTime = microtime(true);
$res = curl_exec($ch);
// 记录请求结束时间
$endTime = microtime(true);
$total_time = curl_getinfo($ch, CURLINFO_TOTAL_TIME); // 获取请求总时间
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if (curl_errno($ch)) {
curl_error($ch);
}
$requestTime = round(($endTime - $startTime) * 1000, 2); // 转换为毫秒
curl_close($ch);
return ['response' => $res, 'http_code' => $httpCode, 'request_time_ms' => $requestTime];
$response = json_decode($res, true);
return ['response' => $response, 'http_code' => $httpCode, 'request_time_ms' => $total_time];
}
}
... ...
... ... @@ -11,6 +11,7 @@ namespace App\Console\Commands\Suppliers;
use App\Models\Product\Keyword;
use App\Models\Project\DeployBuild;
use App\Models\Project\Project;
use App\Models\Purchaser\Purchaser;
use App\Models\Purchaser\PurchaserInfo;
use App\Services\ProjectServer;
... ... @@ -33,6 +34,10 @@ class RecommendedSuppliers extends Command
*/
protected $description = '推荐供应商';
public $deployBuildModel;
public $projectModel;
/**
* Create a new command instance.
*
... ... @@ -40,7 +45,7 @@ class RecommendedSuppliers extends Command
*/
public function __construct()
{
parent::__construct();
$this->deployBuildModel = new DeployBuild();
}
... ... @@ -49,15 +54,42 @@ class RecommendedSuppliers extends Command
*/
public function handle()
{
$projectModel = new DeployBuild();
$project_list = $projectModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
$project_list = $this->deployBuildModel->list(['is_supplier'=>1]);//TODO::已开启推荐供应商
foreach ($project_list as $v){
echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
ProjectServer::useProject($v['project_id']);
$title = $this->getKeywords($v['project_id']);
echo date('Y-m-d H:i:s') . '开始:'.$v['project_id'] . PHP_EOL;
$this->savePurchaser($v['project_id'],$title);
DB::disconnect('custom_mysql');
$result = $this->countPurchaser($v);
if($result !== false){
ProjectServer::useProject($v['project_id']);
$title = $this->getKeywords($v['project_id']);
echo date('Y-m-d H:i:s') . '开始:'.$v['project_id'] . PHP_EOL;
$this->savePurchaser($v['project_id'],$title);
DB::disconnect('custom_mysql');
}
}
return true;
}
/**
* @remark :当前项目拥有的
* @name :countPurchaser
* @author :lyh
* @method :post
* @time :2025/3/10 16:29
* @param :is_purchaser_count;1->开启后已达到上线关闭过 0->未关闭过
* @param :plan(1->专业版 2->标准版 3->商务版 10->旗舰版)
*/
public function countPurchaser($v){
if($v['is_purchaser_count'] == 0){
$purchaserInfoModel = new PurchaserInfo();
$count = $purchaserInfoModel->counts(['project_id'=>$v['project_id']]);
//获取项目版本
$plan = ['专业版'=>300, '标准版'=>500, '商务版'=>800, '旗舰版'=>1200];
$total_number = $plan[Project::planMap()[$v['plan']]] ?? 300;
if($count > $total_number){
//更新数量上限字段,并关闭推荐供应商
$this->deployBuildModel->edit(['is_purchaser_count'=>1,'is_supplier'=>0],['project_id'=>$v['project_id']]);
return false;
}
}
return true;
}
... ...
... ... @@ -154,12 +154,12 @@ class ProjectLogic extends BaseLogic
* @author :lyh
* @method :post
* @time :2023/8/30 11:57
* @param :1->建站中 2->优化中 3->建站完成 6-》错误单
*/
public function projectSave(){
DB::beginTransaction();
try {
if($this->param['type'] == Project::TYPE_SEVEN){
//错误单直接返回,单独处理
$this->setTypeSevenEdit($this->param);
}else{
//初始化项目
... ... @@ -196,6 +196,32 @@ class ProjectLogic extends BaseLogic
}
/**
* @remark :开启推荐供应商设置
* @name :isPurchaser
* @author :lyh
* @method :post
* @time :2025/3/10 15:33
*/
public function isPurchaser($project_id){
if($this->param['type'] == Project::TYPE_TWO){
if(empty($this->param['uptime'])){
$this->param['deploy_build']['is_supplier'] = 1;
}else{
//获取项目的上线时间
$projectInfo = $this->model->read(['id'=>$project_id],['uptime']);
//查看上线时间是否大于3天
$threeDaysAgo = date('Y-m-d H:i:s', strtotime('-3 days'));
if($projectInfo['uptime'] > $threeDaysAgo){
//上线时间大于当前时间的3天钱,默认不允许关闭推荐供应商
$this->param['deploy_build']['is_supplier'] = 1;
}
}
return true;
}
}
/**
* @remark :开启AI博客后
* @name :setAiBlog
* @author :lyh
... ... @@ -206,8 +232,7 @@ class ProjectLogic extends BaseLogic
if(empty($main_lang_id) || empty($is_ai_blog)){
return true;
}
$projectModel = new Project();
$projectInfo = $projectModel->read(['id'=>$project_id],['title','is_ai_blog','main_lang_id','company']);
$projectInfo = $this->model->read(['id'=>$project_id],['title','is_ai_blog','main_lang_id','company']);
//获取项目主语种
$languageModel = new WebLanguage();
$languageInfo = $languageModel->read(['id'=>$main_lang_id],['short']);
... ... @@ -277,8 +302,7 @@ class ProjectLogic extends BaseLogic
return $this->success();
}
//查看當前項目服務器是否有更改
$projectModel = new Project();
$projectInfo = $projectModel->read(['id'=>$project_id],['serve_id']);
$projectInfo = $this->model->read(['id'=>$project_id],['serve_id']);
$serversIpModel = new ServersIp();
$serversModel = new Servers();
if(!empty($projectInfo['serve_id'])){
... ...
... ... @@ -57,12 +57,14 @@ class WebSettingTextLogic extends BaseLogic
if(count($this->param['data']) > $this->param['anchor_num']){
$this->fail('超过最大设置限制');
}
//更新描文本设置
if($this->param['anchor_is_enable'] == 0){
$this->param['anchor_keyword_is_enable'] = 0;
$web_setting->edit($this->param,['project_id'=>$this->user['project_id']]);
return $this->success();
}
DB::beginTransaction();
try {
//更新描文本设置
if($this->param['anchor_is_enable'] == 0){
$this->param['anchor_keyword_is_enable'] = 0;
}
$data = [
'anchor_setting'=>$this->param['anchor_setting'] ?? [],
'anchor_is_enable'=>$this->param['anchor_is_enable'],
... ... @@ -72,7 +74,7 @@ class WebSettingTextLogic extends BaseLogic
];
$web_setting->edit($data,['project_id'=>$this->user['project_id']]);
$this->model->del(['project_id'=>$this->user['project_id']]);
if(!empty($this->param['data'])){
if(isset($this->param['data']) && !empty($this->param['data'])){
foreach ($this->param['data'] as $k => $v){
$v['created_at'] = date('Y-m-d H:i:s');
$v['updated_at'] = date('Y-m-d H:i:s');
... ... @@ -86,6 +88,6 @@ class WebSettingTextLogic extends BaseLogic
DB::rollBack();
$this->fail('更新失败');
}
$this->success();
return $this->success();
}
}
... ...
... ... @@ -4,6 +4,7 @@ namespace App\Models\Workchat;
use App\Models\Base;
use App\Models\Inquiry\InquiryFormData;
use App\Models\Project\Project;
use App\Models\ProjectAssociation\ProjectAssociation;
use App\Services\ProjectServer;
use App\Utils\LogUtils;
... ... @@ -40,12 +41,15 @@ class MessagePush extends Base
* @param $name
* @param $submit_at
* @return bool
* @param : is_forward_inquiry:0未开启转发询盘 1:开启转发询盘
*/
public static function addInquiryMessage($id, $project_id, $country, $name, $submit_at){
// if(!ProjectServer::useProject($project_id)){
// return false;
// }
//查看项目是否开启转发询盘
$projectModel = new Project();
$projectInfo = $projectModel->read(['id'=>$project_id],['is_forward_inquiry']);
if($projectInfo['is_forward_inquiry'] == 0){
return false;
}
//项目是否有绑定群
$friend_id = ProjectAssociation::where('project_id', $project_id)
->where('status', ProjectAssociation::STATUS_NORMAL)
... ...