周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 54db7ef91015b9f32519e98ab4171ab5841e49d5 2 个父辈 f6dcb073 c8f584e0

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

Master server



查看合并请求 !634
内嵌 并排对比
正在显示 7 个修改的文件 包含 35 行增加 和 16 行删除
... ... @@ -39,6 +39,7 @@ class ServersIpController extends BaseController
}
$serversIpModel = new ServersIpModel();
$this->map['total'] = ['<',$info['ip_total']];
$this->map['status'] = 0;
$data = $serversIpModel->list($this->map);
$this->response('success',Code::SUCCESS,$data);
}
... ... @@ -57,6 +58,7 @@ class ServersIpController extends BaseController
'servers_id.required' => '服务器servers_id不能为空'
]);
$serversIpModel = new ServersIpModel();
$this->map['status'] = 0;
$data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$data);
}
... ...
... ... @@ -61,7 +61,7 @@ class ProductController extends BaseController
foreach ($lists['list'] as $k=>$v){
$v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);;
$v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
$v['keyword_id_text'] = mb_substr($this->keywordName($v['keyword_id'],$key_data), 0, 20, 'UTF-8').'...';
$v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
$v['created_uid_text'] = $userModel->getName($v['created_uid']);
$v['is_renovation'] = $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
$v = $this->getHandleFileImage($v);
... ...
... ... @@ -98,12 +98,12 @@ class ServersIpLogic extends BaseLogic
* @time :2024/6/27 13:55
*/
public function batchDelServersIp(){
foreach ($this->param['ids'] as $v){
$info = $this->model->read(['id'=>$v['id']],['total']);
foreach ($this->param['ids'] as $id){
$info = $this->model->read(['id'=>$id],['total']);
if($info['total'] != 0){
continue;
}
$this->model->edit(['status'=>1],['id'=>$v]);
$this->model->edit(['status'=>1],['id'=>$id]);
}
return $this->success();
}
... ...
... ... @@ -8,6 +8,7 @@ use App\Jobs\EditAmpDomainBt;
use App\Jobs\EditCustomDomainBt;
use App\Jobs\EditDomainBt;
use App\Models\Devops\ServerConfig;
use App\Models\Devops\Servers;
use App\Models\Devops\ServersIp;
use App\Models\Domain\DomainInfo;
use App\Models\Project\CountryCustom;
... ... @@ -260,10 +261,13 @@ class DomainInfoLogic extends BaseLogic
$this->fail('获取项目数据失败');
}
$serverIpModel = new ServersIp();
$server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
if($server_info === false){
$serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
if($serversIpInfo === false){
$this->fail('获取服务器数据失败');
}
$serverModel = new Servers();
$serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
$server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
if($project_info['serve_id'] == 9){
$this->fail('请切换服务器,生成站点不能使用测试服务器');
}
... ... @@ -378,11 +382,13 @@ class DomainInfoLogic extends BaseLogic
if($this->param['is_create']){
//需要创建站点
$serverIpModel = new ServersIp();
$server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
if($server_info === false){
$serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
if($serversIpInfo === false){
$this->fail('获取服务器数据失败');
}
$serverModel = new Servers();
$serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
$server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
//域名是否都已经解析
if(strpos($this->param['custom_domain'],'//') === false){
$this->param['custom_domain'] = '//'.$this->param['custom_domain'];
... ...
... ... @@ -3,6 +3,7 @@
namespace App\Jobs;
use App\Models\Devops\ServerConfig;
use App\Models\Devops\Servers;
use App\Models\Devops\ServersIp;
use App\Models\Domain\DomainInfo;
use App\Models\Project\Project;
... ... @@ -54,10 +55,13 @@ class EditAmpDomainBt implements ShouldQueue
}
//获取服务器数据
$serverIpModel = new ServersIp();
$server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
if ($server_info === false) {
$serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
if ($serversIpInfo === false) {
return $this->output($domain_info['domain'] . ':获取服务器数据失败');
}
$serverModel = new Servers();
$serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
$server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
//编辑amp站
$api_url_amp = 'http://' . $server_info['domain'] . '/api/createSiteAmp';
$api_param_amp = [
... ...
... ... @@ -3,6 +3,7 @@
namespace App\Jobs;
use App\Models\Devops\ServerConfig;
use App\Models\Devops\Servers;
use App\Models\Devops\ServersIp;
use App\Models\Project\CountryCustom;
use App\Models\Project\Project;
... ... @@ -53,10 +54,13 @@ class EditCustomDomainBt implements ShouldQueue
}
//获取服务器数据
$serverIpModel = new ServersIp();
$server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
if ($server_info === false) {
$serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
if ($serversIpInfo === false) {
return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败');
}
$serverModel = new Servers();
$serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
$server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
//编辑站点
if ($domain_info['type'] == 2) {
$api_url = 'http://' . $server_info['domain'] . '/api/setSsl';
... ...
... ... @@ -3,6 +3,7 @@
namespace App\Jobs;
use App\Models\Devops\ServerConfig;
use App\Models\Devops\Servers;
use App\Models\Devops\ServersIp;
use App\Models\Domain\DomainInfo;
use App\Models\Project\Project;
... ... @@ -55,11 +56,13 @@ class EditDomainBt implements ShouldQueue
//获取服务器数据
$serverIpModel = new ServersIp();
$server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
if ($server_info === false) {
$serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
if ($serversIpInfo === false) {
return $this->output($domain_info['domain'] . ':获取服务器数据失败');
}
$serverModel = new Servers();
$serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
$server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
//编辑主站
if ($domain_info['type'] == 2) {
$api_url = 'http://' . $server_info['domain'] . '/api/setSsl';
... ...