周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 99fe288379ccb53beb036e4ef5a714ae9aa13726 2 个父辈 de679b7e ec46335e

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 5 个修改的文件 包含 16 行增加 和 12 行删除
@@ -34,7 +34,7 @@ class UpgradeCount extends Command @@ -34,7 +34,7 @@ class UpgradeCount extends Command
34 34
35 public function handle(){ 35 public function handle(){
36 $projectModel = new Project(); 36 $projectModel = new Project();
37 - $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]); 37 + $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0,'id'=>['<=',985]]);
38 foreach ($list as $v) { 38 foreach ($list as $v) {
39 echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL; 39 echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
40 ProjectServer::useProject($v['id']); 40 ProjectServer::useProject($v['id']);
@@ -55,7 +55,7 @@ class UpdateRoute extends Command @@ -55,7 +55,7 @@ class UpdateRoute extends Command
55 */ 55 */
56 public function handle(){ 56 public function handle(){
57 $projectModel = new Project(); 57 $projectModel = new Project();
58 - $list = $projectModel->list(['id'=>264]); 58 + $list = $projectModel->list(['id'=>343]);
59 $data = []; 59 $data = [];
60 foreach ($list as $v){ 60 foreach ($list as $v){
61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -33,6 +33,7 @@ class OptimizeController extends BaseController @@ -33,6 +33,7 @@ class OptimizeController extends BaseController
33 public function lists(Project $project){ 33 public function lists(Project $project){
34 $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id') 34 $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
35 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 35 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
  36 + ->leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
36 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 37 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
37 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id'); 38 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
38 $query = $this->searchParam($query)->orderByRaw("FIELD(gl_project.level, '2') DESC") 39 $query = $this->searchParam($query)->orderByRaw("FIELD(gl_project.level, '2') DESC")
@@ -131,8 +132,10 @@ class OptimizeController extends BaseController @@ -131,8 +132,10 @@ class OptimizeController extends BaseController
131 $item['plan'] = Project::planMap()[$item['plan']]; 132 $item['plan'] = Project::planMap()[$item['plan']];
132 $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date'])); 133 $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
133 $item['autologin_code'] = getAutoLoginCode($item['id']); 134 $item['autologin_code'] = getAutoLoginCode($item['id']);
134 - $domainModel = new DomainInfo();  
135 - $item['domain'] = !empty($item['domain']) ? $domainModel->getDomain($item['domain']) : ''; 135 + $item['domain'] = 'https://'.$item['domain'].'/';
  136 + if(!empty($item['domain']) && $item['amp_status'] == 1){
  137 + $item['amp_domain'] = str_replace('www','m',$item['domain']);
  138 + }
136 $item['product_num'] = $data['product'] ?? 0; 139 $item['product_num'] = $data['product'] ?? 0;
137 $item['keyword_num'] = $item['key'] ?? 0; 140 $item['keyword_num'] = $item['key'] ?? 0;
138 $item['autologin_code'] = getAutoLoginCode($item['id']); 141 $item['autologin_code'] = getAutoLoginCode($item['id']);
@@ -186,11 +189,12 @@ class OptimizeController extends BaseController @@ -186,11 +189,12 @@ class OptimizeController extends BaseController
186 'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid', 189 'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
187 'gl_project_deploy_optimize.design_mid AS design_mid', 190 'gl_project_deploy_optimize.design_mid AS design_mid',
188 'gl_project_deploy_optimize.tech_leader AS tech_leader', 191 'gl_project_deploy_optimize.tech_leader AS tech_leader',
189 - 'gl_project_deploy_optimize.domain AS domain',  
190 'gl_project_deploy_optimize.quality_mid AS quality_mid', 192 'gl_project_deploy_optimize.quality_mid AS quality_mid',
191 'gl_project_deploy_optimize.design_mid AS design_mid', 193 'gl_project_deploy_optimize.design_mid AS design_mid',
192 'gl_project_deploy_optimize.start_date AS start_date', 194 'gl_project_deploy_optimize.start_date AS start_date',
193 'gl_project_deploy_optimize.backlink AS backlink', 195 'gl_project_deploy_optimize.backlink AS backlink',
  196 + 'gl_domain_info.amp_status AS amp_status',
  197 + 'gl_domain_info.domain AS domain',
194 ]; 198 ];
195 return $select; 199 return $select;
196 } 200 }
@@ -246,8 +250,8 @@ class OptimizeController extends BaseController @@ -246,8 +250,8 @@ class OptimizeController extends BaseController
246 if(isset($this->map['domain']) && !empty($this->map['domain'])){ 250 if(isset($this->map['domain']) && !empty($this->map['domain'])){
247 $parsedUrl = parse_url($this->map['domain']); 251 $parsedUrl = parse_url($this->map['domain']);
248 $this->map['domain'] = $parsedUrl['host'] ?? $this->map['domain']; 252 $this->map['domain'] = $parsedUrl['host'] ?? $this->map['domain'];
249 - $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain'].'%')->pluck('id')->toArray();  
250 - $query = $query->whereIn('gl_project_deploy_optimize.domain', $ids); 253 +// $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain'].'%')->pluck('id')->toArray();
  254 + $query = $query->where('gl_domain_info.domain', 'like' ,'%'.$this->map['domain'].'%');
251 } 255 }
252 if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){ 256 if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
253 $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%'); 257 $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
@@ -397,7 +397,7 @@ class ProjectLogic extends BaseLogic @@ -397,7 +397,7 @@ class ProjectLogic extends BaseLogic
397 $info = $this->model->read(['id'=>$param['id']]); 397 $info = $this->model->read(['id'=>$param['id']]);
398 if($info['delete_status'] == 0){ 398 if($info['delete_status'] == 0){
399 //删除原始项目 399 //删除原始项目
400 - $this->edit(['delete_status' => 1], ['id' => $param['id']]); 400 + $this->edit(['delete_status' => 1,'type'=>$param['type']], ['id' => $param['id']]);
401 //添加到续费单 401 //添加到续费单
402 $data = [ 402 $data = [
403 'title' => '【续费单】' . $param['title'], 403 'title' => '【续费单】' . $param['title'],
@@ -411,8 +411,8 @@ class ProjectLogic extends BaseLogic @@ -411,8 +411,8 @@ class ProjectLogic extends BaseLogic
411 'service_duration' => $param['deploy_build']['service_duration'], 411 'service_duration' => $param['deploy_build']['service_duration'],
412 'plan' => $param['deploy_build']['plan'], 412 'plan' => $param['deploy_build']['plan'],
413 'amount' => $param['payment']['amount'], 413 'amount' => $param['payment']['amount'],
414 - 'contract' => json_encode($param['payment']['contract']),  
415 - 'bill' => json_encode($param['payment']['bill']), 414 + 'contract' => json_encode($param['payment']['contract'] ?? []),
  415 + 'bill' => json_encode($param['payment']['bill'] ?? []),
416 ]; 416 ];
417 $renewModel = new ProjectRenew(); 417 $renewModel = new ProjectRenew();
418 $renewModel->add($data); 418 $renewModel->add($data);
@@ -14,8 +14,8 @@ Route::middleware(['aloginauth'])->group(function () { @@ -14,8 +14,8 @@ Route::middleware(['aloginauth'])->group(function () {
14 Route::any('/editPassword', [Aside\Com\IndexController::class, 'editPassword'])->name('admin.editPassword.white'); 14 Route::any('/editPassword', [Aside\Com\IndexController::class, 'editPassword'])->name('admin.editPassword.white');
15 Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white'); 15 Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
16 Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址 16 Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
17 - Route::get('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');  
18 - Route::get('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry'); 17 + Route::any('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');
  18 + Route::any('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry');
19 19
20 //会员相关 20 //会员相关
21 Route::prefix('user')->group(function () { 21 Route::prefix('user')->group(function () {