Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6
正在显示
11 个修改的文件
包含
298 行增加
和
69 行删除
| @@ -78,14 +78,11 @@ class RemainDay extends Command | @@ -78,14 +78,11 @@ class RemainDay extends Command | ||
| 78 | continue; | 78 | continue; |
| 79 | } | 79 | } |
| 80 | $diff = time() - strtotime($opInfo['start_date'] ?? $item->uptime); | 80 | $diff = time() - strtotime($opInfo['start_date'] ?? $item->uptime); |
| 81 | - $remain_day = $item['deploy_build']['service_duration'] + $item->pause_days - floor($diff / (60 * 60 * 24)); | 81 | + $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24)); |
| 82 | }else{ | 82 | }else{ |
| 83 | if($item['type'] == Project::TYPE_TWO){ | 83 | if($item['type'] == Project::TYPE_TWO){ |
| 84 | $compliance_day = ($item->finish_remain_day ?? 0); | 84 | $compliance_day = ($item->finish_remain_day ?? 0); |
| 85 | - if($item->finish_remain_day < $item->pause_days){ | ||
| 86 | - $item->pause_days = $item->finish_remain_day; | ||
| 87 | - } | ||
| 88 | - $remain_day = $item['deploy_build']['service_duration'] + $item->pause_days - $compliance_day; | 85 | + $remain_day = $item['deploy_build']['service_duration'] - $compliance_day; |
| 89 | }else{ | 86 | }else{ |
| 90 | if($item->uptime){ | 87 | if($item->uptime){ |
| 91 | $diff = time() - strtotime($item->uptime); | 88 | $diff = time() - strtotime($item->uptime); |
| @@ -9,6 +9,7 @@ namespace App\Console\Commands\Test; | @@ -9,6 +9,7 @@ namespace App\Console\Commands\Test; | ||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | use App\Helper\Arr; | 11 | use App\Helper\Arr; |
| 12 | +use App\Helper\Translate; | ||
| 12 | use App\Models\Blog\Blog; | 13 | use App\Models\Blog\Blog; |
| 13 | use App\Models\Blog\BlogCategory; | 14 | use App\Models\Blog\BlogCategory; |
| 14 | use App\Models\Com\KeywordVideoTask; | 15 | use App\Models\Com\KeywordVideoTask; |
| @@ -58,65 +59,28 @@ class Demo extends Command | @@ -58,65 +59,28 @@ class Demo extends Command | ||
| 58 | */ | 59 | */ |
| 59 | protected $description = 'demo'; | 60 | protected $description = 'demo'; |
| 60 | 61 | ||
| 61 | - public static $main404Html = '<main> | ||
| 62 | - <section data-section="section" data-screen="screen-large" class="section-404-wrap-block section-block-error404" | ||
| 63 | - id="sectionIdyxqu938"> | ||
| 64 | - <div class="layout" data-unable="demo01-error404"> | ||
| 65 | - <img src="https://ecdn6.globalso.com/upload/m/image_other/2023-10/6528a87e594db30162.png" /> | ||
| 66 | - </div> | ||
| 67 | - <p style="text-align: center">SORRY. THE PAGE HAS EITHER MOVED OR CANNOT BE FOUND.</p> | ||
| 68 | - <style> | ||
| 69 | - .section-block-error404 .layout { | ||
| 70 | - height: 700px; | ||
| 71 | - display: flex; | ||
| 72 | - align-items: center; | ||
| 73 | - justify-content: center; | ||
| 74 | - } | ||
| 75 | - .section-block-error404 img { | ||
| 76 | - width: 400px; | ||
| 77 | - } | ||
| 78 | - @media only screen and (max-width:500) { | ||
| 79 | - .section-block-error404 img { | ||
| 80 | - max-width: 100%; | ||
| 81 | - } | ||
| 82 | - } | ||
| 83 | - </style> | ||
| 84 | - <script> | ||
| 85 | - </script> | ||
| 86 | - </section> | ||
| 87 | - </main>'; | ||
| 88 | public function handle(){ | 62 | public function handle(){ |
| 89 | $projectModel = new Project(); | 63 | $projectModel = new Project(); |
| 90 | - $list = $projectModel->list(['is_upgrade'=>1]); | ||
| 91 | - $data = []; | 64 | + $list = $projectModel->list(['id'=>1659]); |
| 92 | foreach ($list as $v){ | 65 | foreach ($list as $v){ |
| 93 | echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; | 66 | echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; |
| 94 | ProjectServer::useProject($v['id']); | 67 | ProjectServer::useProject($v['id']); |
| 95 | - $this->init404Page($v['id']); | 68 | + $this->getProduct(); |
| 96 | DB::disconnect('custom_mysql'); | 69 | DB::disconnect('custom_mysql'); |
| 97 | } | 70 | } |
| 98 | echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; | 71 | echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; |
| 99 | } | 72 | } |
| 100 | - public static function init404Page($project_id){ | ||
| 101 | - $time = date('Y-m-d H:i:s'); | ||
| 102 | - $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->where('url',BCustomTemplate::NOT_FOUND_PAGE_URL)->first(); | ||
| 103 | - if(empty($info)) { | ||
| 104 | - $data = [ | ||
| 105 | - 'project_id' => $project_id, | ||
| 106 | - 'name' => BCustomTemplate::NOT_FOUND_PAGE_URL, | ||
| 107 | - 'status' => 1, | ||
| 108 | - 'url' => BCustomTemplate::NOT_FOUND_PAGE_URL, | ||
| 109 | - 'html' => self::$main404Html, | ||
| 110 | - 'html_style' => '<style id="globalsojs-styles"></style>', | ||
| 111 | - 'title' => '404-Page not found', | ||
| 112 | - 'description' => 'Sorry. The page has either moved or cannot be found.', | ||
| 113 | - 'created_at' => $time, 'updated_at' => $time]; | ||
| 114 | - $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data); | ||
| 115 | - //路由 | ||
| 116 | - $info = DB::connection('custom_mysql')->table('gl_route_map')->first(); | ||
| 117 | - if(empty($info)) { | ||
| 118 | - $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => BCustomTemplate::NOT_FOUND_PAGE_URL, 'created_at' => $time, 'updated_at' => $time]; | ||
| 119 | - DB::connection('custom_mysql')->table('gl_route_map')->insert($data); | 73 | + |
| 74 | + public function getProduct(){ | ||
| 75 | + $productModel = new Product(); | ||
| 76 | + $lists = $productModel->list(['status'=>['!=',2]]); | ||
| 77 | + if(!empty($lists)){ | ||
| 78 | + foreach ($lists as $v){ | ||
| 79 | + if(!empty($v['route'])){ | ||
| 80 | + echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; | ||
| 81 | + $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']); | ||
| 82 | + $productModel->edit(['route'=>$route],['id'=>$v['id']]); | ||
| 83 | + } | ||
| 120 | } | 84 | } |
| 121 | } | 85 | } |
| 122 | } | 86 | } |
| @@ -12,6 +12,7 @@ use App\Http\Logic\Bside\User\UserLoginLogic; | @@ -12,6 +12,7 @@ use App\Http\Logic\Bside\User\UserLoginLogic; | ||
| 12 | use App\Models\Domain\DomainInfo; | 12 | use App\Models\Domain\DomainInfo; |
| 13 | use App\Models\Product\Category; | 13 | use App\Models\Product\Category; |
| 14 | use App\Models\Product\CategoryRelated; | 14 | use App\Models\Product\CategoryRelated; |
| 15 | +use App\Models\Product\Keyword; | ||
| 15 | use App\Models\Product\Product; | 16 | use App\Models\Product\Product; |
| 16 | use App\Models\Project\OnlineCheck; | 17 | use App\Models\Project\OnlineCheck; |
| 17 | use App\Models\Project\Project; | 18 | use App\Models\Project\Project; |
| @@ -151,11 +152,7 @@ class PrivateController extends BaseController | @@ -151,11 +152,7 @@ class PrivateController extends BaseController | ||
| 151 | } | 152 | } |
| 152 | 153 | ||
| 153 | /** | 154 | /** |
| 154 | - * @remark :模拟登录返回token | ||
| 155 | - * @name :getToken | ||
| 156 | - * @author :lyh | ||
| 157 | - * @method :post | ||
| 158 | - * @time :2024/3/29 16:19 | 155 | + * 模拟登录返回token |
| 159 | */ | 156 | */ |
| 160 | public function getAutoToken(){ | 157 | public function getAutoToken(){ |
| 161 | $this->request->validate([ | 158 | $this->request->validate([ |
| @@ -201,4 +198,96 @@ class PrivateController extends BaseController | @@ -201,4 +198,96 @@ class PrivateController extends BaseController | ||
| 201 | $product_route = Product::where(['status' => Product::STATUS_ON])->whereNotIn('id', $feature_product)->pluck('route')->toArray(); | 198 | $product_route = Product::where(['status' => Product::STATUS_ON])->whereNotIn('id', $feature_product)->pluck('route')->toArray(); |
| 202 | return $this->success($product_route); | 199 | return $this->success($product_route); |
| 203 | } | 200 | } |
| 201 | + | ||
| 202 | + /** | ||
| 203 | + * 获取项目信息---站群服务 | ||
| 204 | + * @param Request $request | ||
| 205 | + * @return false|string | ||
| 206 | + */ | ||
| 207 | + public function getProjectByDomain(Request $request) | ||
| 208 | + { | ||
| 209 | + $domain = trim($request->input('domain')); | ||
| 210 | + if (empty($domain)) { | ||
| 211 | + return $this->error('非法参数!'); | ||
| 212 | + } | ||
| 213 | + | ||
| 214 | + $project = Project::getProjectByDomain($domain); | ||
| 215 | + if (empty($project)) { | ||
| 216 | + return $this->error('未找到当前域名对应的项目!'); | ||
| 217 | + } | ||
| 218 | + $optimize = $project->optimize; | ||
| 219 | + $keyword = $project->project_keyword; | ||
| 220 | + $keywords = explode("\r\n", $keyword ? $keyword->main_keyword : []); | ||
| 221 | + $result = [ | ||
| 222 | + 'company' => $project->company, | ||
| 223 | + 'company_en_name' => $optimize ? $optimize->company_en_name : '', | ||
| 224 | + 'company_en_description' => $optimize ? $optimize->company_en_description : '', | ||
| 225 | + 'keywords' => $keywords | ||
| 226 | + ]; | ||
| 227 | + return $this->success($result); | ||
| 228 | + } | ||
| 229 | + | ||
| 230 | + /** | ||
| 231 | + * 获取产品信息---站群服务 | ||
| 232 | + * @param Request $request | ||
| 233 | + * @return false|string | ||
| 234 | + */ | ||
| 235 | + public function getProjectProduct(Request $request) | ||
| 236 | + { | ||
| 237 | + $domain = trim($request->input('domain')); | ||
| 238 | + $page_size = intval($request->input('page_size', 20)); | ||
| 239 | + if (empty($domain)) { | ||
| 240 | + return $this->error('非法参数!'); | ||
| 241 | + } | ||
| 242 | + | ||
| 243 | + $project = Project::getProjectByDomain($domain); | ||
| 244 | + if (empty($project)) { | ||
| 245 | + return $this->error('未找到当前域名对应的项目!'); | ||
| 246 | + } | ||
| 247 | + ProjectServer::useProject($project->id); | ||
| 248 | + $products = Product::with('category')->where(['status' => Product::STATUS_ON])->paginate($page_size); | ||
| 249 | + | ||
| 250 | +// $products_ids = $products->pluck('id')->toArray(); | ||
| 251 | +// $category_ids = CategoryRelated::whereIn('product_id', $products_ids)->pluck('cate_id')->toArray(); | ||
| 252 | +// $category = Category::whereIn('id', $category_ids)->pluck('title', 'id')->toArray(); | ||
| 253 | + | ||
| 254 | + $keyword_id = $products->pluck('keyword_id')->toArray(); | ||
| 255 | + $keyword_ids = array_reduce($keyword_id, 'array_merge', array()); | ||
| 256 | + $keyword = Keyword::whereIn('id', $keyword_ids)->pluck('title', 'id')->toArray(); | ||
| 257 | + | ||
| 258 | + $result = []; | ||
| 259 | + foreach ($products as $product) { | ||
| 260 | + $product_keyword = []; | ||
| 261 | + foreach ($product->keyword_id as $k_id) { | ||
| 262 | + array_push($product_keyword, $keyword[$k_id]); | ||
| 263 | + } | ||
| 264 | + $product_category = $product->category->pluck('title')->toArray(); | ||
| 265 | + $result[] = [ | ||
| 266 | + 'title' => $product->title, | ||
| 267 | + 'thumb' => $product->thumb, | ||
| 268 | + 'gallery' => $product->gallery, | ||
| 269 | + 'intro' => $product->intro, | ||
| 270 | + 'content' => $product->content, | ||
| 271 | + 'category' => $product_category, | ||
| 272 | + 'keyword' => $product_keyword, | ||
| 273 | + 'route' => $product->route | ||
| 274 | + ]; | ||
| 275 | + } | ||
| 276 | + return $this->success($result); | ||
| 277 | + } | ||
| 278 | + | ||
| 279 | + /** | ||
| 280 | + * 获取上线项目 --- 监控服务 | ||
| 281 | + * @param Request $request | ||
| 282 | + * @return false|string | ||
| 283 | + */ | ||
| 284 | + public function getProjectOnline(Request $request) | ||
| 285 | + { | ||
| 286 | + $page_size = intval($request->input('page_size', 20)); | ||
| 287 | + $projects = Project::select(['id', 'title', 'company', 'type', 'finish_remain_day', 'remain_day'])->whereIn('type', [2, 3, 4, 6])->where('delete_status', 0)->paginate($page_size); | ||
| 288 | + foreach ($projects as $project) { | ||
| 289 | + $project->domain = $project->domainInfo ? $project->domainInfo->domain : ''; | ||
| 290 | + } | ||
| 291 | + return $this->success($projects); | ||
| 292 | + } | ||
| 204 | } | 293 | } |
| 1 | +<?php | ||
| 2 | +/** | ||
| 3 | + * @remark : | ||
| 4 | + * @name :ExtensionModuleController.php | ||
| 5 | + * @author :lyh | ||
| 6 | + * @method :post | ||
| 7 | + * @time :2024/8/7 16:15 | ||
| 8 | + */ | ||
| 9 | + | ||
| 10 | +namespace App\Http\Controllers\Bside\ExtensionModule; | ||
| 11 | + | ||
| 12 | +use App\Enums\Common\Code; | ||
| 13 | +use App\Http\Controllers\Bside\BaseController; | ||
| 14 | +use App\Http\Logic\Bside\ExtensionModule\ExtensionModuleFieldLogic; | ||
| 15 | +use App\Models\ExtentModule\Extension2205ModuleValueLog; | ||
| 16 | +use App\Models\ExtentModule\ExtensionModule; | ||
| 17 | +use App\Models\ExtentModule\ExtensionModuleField; | ||
| 18 | +use App\Models\ExtentModule\ExtensionModuleValue; | ||
| 19 | +use Illuminate\Support\Facades\DB; | ||
| 20 | + | ||
| 21 | +/** | ||
| 22 | + * @remark :单独处理2205项目扩展 | ||
| 23 | + * @name :Extension2205ModuleController | ||
| 24 | + * @author :lyh | ||
| 25 | + * @method :post | ||
| 26 | + * @time :2024/9/4 14:32 | ||
| 27 | + */ | ||
| 28 | +class Extension2205ModuleController extends BaseController | ||
| 29 | +{ | ||
| 30 | + /** | ||
| 31 | + * @remark : | ||
| 32 | + * @name :get2205List | ||
| 33 | + * @author :lyh | ||
| 34 | + * @method :post | ||
| 35 | + * @time :2024/9/4 16:28 | ||
| 36 | + */ | ||
| 37 | + public function get2205List(){ | ||
| 38 | + $this->request->validate([ | ||
| 39 | + 'uuid'=>'required', | ||
| 40 | + ],[ | ||
| 41 | + 'uuid.required' => 'uuid不能为空', | ||
| 42 | + ]); | ||
| 43 | + $log2205Model = new Extension2205ModuleValueLog(); | ||
| 44 | + $lists = $log2205Model->list(['module_id'=>1,'uuid'=>$this->param['uuid']]); | ||
| 45 | + $this->response('success',Code::SUCCESS,$lists); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * @remark :流程控制处理(2205) | ||
| 50 | + * @name :save2205Status | ||
| 51 | + * @author :lyh | ||
| 52 | + * @method :post | ||
| 53 | + * @time :2024/9/4 14:34 | ||
| 54 | + */ | ||
| 55 | + public function save2205Status(){ | ||
| 56 | + $this->request->validate([ | ||
| 57 | + 'uuid'=>'required', | ||
| 58 | + 'status'=>'required', | ||
| 59 | + 'date'=>'required', | ||
| 60 | + ],[ | ||
| 61 | + 'uuid.required' => 'uuid不能为空', | ||
| 62 | + 'status.required' => 'status不能为空', | ||
| 63 | + 'date.required' => 'status不能为空', | ||
| 64 | + ]); | ||
| 65 | + if(empty($this->param['status']) || empty($this->param['date'])){ | ||
| 66 | + $this->response('success'); | ||
| 67 | + } | ||
| 68 | + if($this->user['project_id'] != 2205){ | ||
| 69 | + $this->fail('当前接口为2205私有接口'); | ||
| 70 | + } | ||
| 71 | + $this->param['module_id'] = $this->param['module_id'] ?? 1; | ||
| 72 | + $filedModel = new ExtensionModuleField(); | ||
| 73 | + $fileInfo = $filedModel->read(['id'=>12]);//获取当前下拉框的数据 | ||
| 74 | + if($fileInfo === false){ | ||
| 75 | + $this->fail('当前字段不存在'); | ||
| 76 | + } | ||
| 77 | + $statusData = json_decode($fileInfo['data'],true); | ||
| 78 | + $data = []; | ||
| 79 | + $number = 1; | ||
| 80 | + foreach ($statusData as $v){ | ||
| 81 | + $data[$v] = $number; | ||
| 82 | + $number++; | ||
| 83 | + } | ||
| 84 | + $log2205Model = new Extension2205ModuleValueLog(); | ||
| 85 | + $log2205Info = $log2205Model->read(['module_id'=>$this->param['module_id'],'uuid'=>$this->param['uuid'],'status'=>$this->param['status']]); | ||
| 86 | + if($log2205Info == false){ | ||
| 87 | + $data = [ | ||
| 88 | + 'module_id'=>$this->param['module_id'], | ||
| 89 | + 'uuid'=>$this->param['uuid'], | ||
| 90 | + 'status'=>$this->param['status'], | ||
| 91 | + 'date'=>$this->param['date'], | ||
| 92 | + 'remark'=>$this->param['remark'] ?? '' | ||
| 93 | + ]; | ||
| 94 | + $id = $log2205Model->addReturnId($data); | ||
| 95 | + }else{ | ||
| 96 | + $id = $log2205Info['id']; | ||
| 97 | + $data = [ | ||
| 98 | + 'date'=>$this->param['date'], | ||
| 99 | + 'remark'=>$this->param['remark'] ?? '' | ||
| 100 | + ]; | ||
| 101 | + $log2205Model->edit($data,['id'=>$log2205Info['id']]); | ||
| 102 | + } | ||
| 103 | + $this->response('success',Code::SUCCESS,['id'=>$id]); | ||
| 104 | + } | ||
| 105 | +} |
| @@ -192,12 +192,29 @@ class ExtensionModuleController extends BaseController | @@ -192,12 +192,29 @@ class ExtensionModuleController extends BaseController | ||
| 192 | ]; | 192 | ]; |
| 193 | $moduleValueModel->addReturnId($data); | 193 | $moduleValueModel->addReturnId($data); |
| 194 | }else{ | 194 | }else{ |
| 195 | + if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){ | ||
| 196 | + if($v['field_id'] == 12 && (!empty($v['value']) && !empty($info['value']))){//下拉框数据 | ||
| 197 | + $filedModel = new ExtensionModuleField(); | ||
| 198 | + $fileInfo = $filedModel->read(['id'=>12]);//获取当前下拉框的数据 | ||
| 199 | + $statusData = json_decode($fileInfo['data'],true); | ||
| 200 | + $status_data = []; | ||
| 201 | + $number = 1; | ||
| 202 | + foreach ($statusData as $value){ | ||
| 203 | + $status_data[$value] = $number; | ||
| 204 | + $number++; | ||
| 205 | + } | ||
| 206 | + if($status_data[$info['value']] > $status_data[$v['value']]){ | ||
| 207 | + $this->fail('流程控制不能回滚'); | ||
| 208 | + } | ||
| 209 | + } | ||
| 210 | + } | ||
| 195 | $moduleValueModel->edit(['value'=>$v['value'] ?? ''],['id'=>$info['id']]); | 211 | $moduleValueModel->edit(['value'=>$v['value'] ?? ''],['id'=>$info['id']]); |
| 196 | } | 212 | } |
| 197 | } | 213 | } |
| 198 | $this->response('success',Code::SUCCESS,['uuid'=>$this->param['uuid']]); | 214 | $this->response('success',Code::SUCCESS,['uuid'=>$this->param['uuid']]); |
| 199 | } | 215 | } |
| 200 | 216 | ||
| 217 | + | ||
| 201 | /** | 218 | /** |
| 202 | * @remark :新增數據 | 219 | * @remark :新增數據 |
| 203 | * @name :addModuleValue | 220 | * @name :addModuleValue |
| @@ -209,10 +209,21 @@ class DomainInfoLogic extends BaseLogic | @@ -209,10 +209,21 @@ class DomainInfoLogic extends BaseLogic | ||
| 209 | } | 209 | } |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | + $extend_config = []; | ||
| 213 | + $unique_extend = []; | ||
| 214 | + if(isset($this->param['extend_config']) && $this->param['extend_config']){ | ||
| 215 | + foreach ($this->param['extend_config'] as $k=>$v){ | ||
| 216 | + if(!in_array($v['origin'],$unique_extend)){ | ||
| 217 | + $unique_extend[] = $v['origin']; | ||
| 218 | + $extend_config[] = $v; | ||
| 219 | + } | ||
| 220 | + } | ||
| 221 | + } | ||
| 222 | + | ||
| 212 | //保存301跳转数据+其他域名 | 223 | //保存301跳转数据+其他域名 |
| 213 | $data = [ | 224 | $data = [ |
| 214 | 'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])), | 225 | 'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])), |
| 215 | - 'extend_config'=>json_encode(array_filter($this->param['extend_config'] ?? [])), | 226 | + 'extend_config'=>json_encode($extend_config), |
| 216 | 'type'=>$this->param['type'], | 227 | 'type'=>$this->param['type'], |
| 217 | 'private_key' => $this->param['key'] ?? '', | 228 | 'private_key' => $this->param['key'] ?? '', |
| 218 | 'private_cert' => $this->param['cert'] ?? '', | 229 | 'private_cert' => $this->param['cert'] ?? '', |
| @@ -45,8 +45,8 @@ class NewsCategoryLogic extends BaseLogic | @@ -45,8 +45,8 @@ class NewsCategoryLogic extends BaseLogic | ||
| 45 | public function newsCategorySave(){ | 45 | public function newsCategorySave(){ |
| 46 | //验证名称是否存在 | 46 | //验证名称是否存在 |
| 47 | $this->verifyParamName($this->param['name']); | 47 | $this->verifyParamName($this->param['name']); |
| 48 | -// DB::beginTransaction(); | ||
| 49 | -// try { | 48 | + DB::beginTransaction(); |
| 49 | + try { | ||
| 50 | if(isset($this->param['id']) && !empty($this->param['id'])){ | 50 | if(isset($this->param['id']) && !empty($this->param['id'])){ |
| 51 | $id = $this->param['id']; | 51 | $id = $this->param['id']; |
| 52 | $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); | 52 | $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); |
| @@ -62,11 +62,11 @@ class NewsCategoryLogic extends BaseLogic | @@ -62,11 +62,11 @@ class NewsCategoryLogic extends BaseLogic | ||
| 62 | $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); | 62 | $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); |
| 63 | $this->model->edit(['alias'=>$route],['id'=>$id]); | 63 | $this->model->edit(['alias'=>$route],['id'=>$id]); |
| 64 | } | 64 | } |
| 65 | -// DB::commit(); | ||
| 66 | -// }catch (\Exception $e){ | ||
| 67 | -// DB::rollBack(); | ||
| 68 | -// $this->fail('系统错误,请联系管理员'); | ||
| 69 | -// } | 65 | + DB::commit(); |
| 66 | + }catch (\Exception $e){ | ||
| 67 | + DB::rollBack(); | ||
| 68 | + $this->fail('系统错误,请联系管理员'); | ||
| 69 | + } | ||
| 70 | $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route); | 70 | $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route); |
| 71 | $this->curlDelRoute(['new_route'=>$route]); | 71 | $this->curlDelRoute(['new_route'=>$route]); |
| 72 | return $this->success(['id'=>$id]); | 72 | return $this->success(['id'=>$id]); |
| @@ -447,7 +447,10 @@ class RankDataLogic extends BaseLogic | @@ -447,7 +447,10 @@ class RankDataLogic extends BaseLogic | ||
| 447 | $without_project_ids = []; //不用处理排名的项目 | 447 | $without_project_ids = []; //不用处理排名的项目 |
| 448 | $without_extension_project_ids = [658]; //是否达标只统计主词的 | 448 | $without_extension_project_ids = [658]; //是否达标只统计主词的 |
| 449 | $extension_project_ids = [354]; //扩展词也到达标的 | 449 | $extension_project_ids = [354]; //扩展词也到达标的 |
| 450 | - | 450 | + $ceaseProjectId = [ |
| 451 | + 354, | ||
| 452 | + 1283 | ||
| 453 | + ];//暂停项目id | ||
| 451 | $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0; | 454 | $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0; |
| 452 | $first_page_without_extension_num = 0; //不算扩展词在首页的数量 | 455 | $first_page_without_extension_num = 0; //不算扩展词在首页的数量 |
| 453 | $first_page_extension_num = 0; //扩展词在首页的数量 | 456 | $first_page_extension_num = 0; //扩展词在首页的数量 |
| @@ -516,8 +519,13 @@ class RankDataLogic extends BaseLogic | @@ -516,8 +519,13 @@ class RankDataLogic extends BaseLogic | ||
| 516 | //项目表更新 | 519 | //项目表更新 |
| 517 | if (($model->updated_date != date('Y-m-d') || empty($model_is_compliance)) && !$lang) { | 520 | if (($model->updated_date != date('Y-m-d') || empty($model_is_compliance)) && !$lang) { |
| 518 | $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0; | 521 | $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0; |
| 522 | + if(!in_array($project_id,$ceaseProjectId)){ | ||
| 519 | Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]); | 523 | Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]); |
| 520 | Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1:'. ($compliance_day + 1)); | 524 | Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1:'. ($compliance_day + 1)); |
| 525 | + }else{ | ||
| 526 | + Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day]); | ||
| 527 | + Log::channel('rank_data')->info('项目' . $project_id . '暂停项目达标天数不加:'. ($compliance_day)); | ||
| 528 | + } | ||
| 521 | } | 529 | } |
| 522 | $model->is_compliance = 1; | 530 | $model->is_compliance = 1; |
| 523 | } else { | 531 | } else { |
| 1 | +<?php | ||
| 2 | +/** | ||
| 3 | + * @remark : | ||
| 4 | + * @name :ExtensionModuleValue.php | ||
| 5 | + * @author :lyh | ||
| 6 | + * @method :post | ||
| 7 | + * @time :2024/8/7 16:10 | ||
| 8 | + */ | ||
| 9 | + | ||
| 10 | +namespace App\Models\ExtentModule; | ||
| 11 | + | ||
| 12 | +use App\Models\Base; | ||
| 13 | + | ||
| 14 | +/** | ||
| 15 | + * @remark :2205单独的类 | ||
| 16 | + * @name :Extension2205ModuleValueLog | ||
| 17 | + * @author :lyh | ||
| 18 | + * @method :post | ||
| 19 | + * @time :2024/9/4 14:50 | ||
| 20 | + */ | ||
| 21 | +class Extension2205ModuleValueLog extends Base | ||
| 22 | +{ | ||
| 23 | + protected $table = 'gl_extension_module_value_log'; | ||
| 24 | + //连接数据库 | ||
| 25 | + protected $connection = 'custom_mysql'; | ||
| 26 | +} |
| @@ -39,6 +39,15 @@ Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class, | @@ -39,6 +39,15 @@ Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class, | ||
| 39 | // 特殊项目 有效产品路由 | 39 | // 特殊项目 有效产品路由 |
| 40 | Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route'); | 40 | Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route'); |
| 41 | 41 | ||
| 42 | +// --------------------- 站群服务 ------------------------------------------ | ||
| 43 | +// 获取项目信息 | ||
| 44 | +Route::any('get_project_detail', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByDomain'])->name('api.project_detail'); | ||
| 45 | +// 获取项目产品信息 | ||
| 46 | +Route::any('get_project_product', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectProduct'])->name('api.project_product'); | ||
| 47 | +// --------------------- 站群服务 ------------------------------------------ | ||
| 48 | +// --------------------- 监控服务 ------------------------------------------ | ||
| 49 | +Route::any('get_project_online', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectOnline'])->name('api.get_project_online'); | ||
| 50 | + | ||
| 42 | //自建站接口转接 | 51 | //自建站接口转接 |
| 43 | Route::post('selfSiteApi', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteApi']); | 52 | Route::post('selfSiteApi', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteApi']); |
| 44 | Route::post('selfSiteNotify', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteNotify']); | 53 | Route::post('selfSiteNotify', [\App\Http\Controllers\Api\SelfSiteController::class, 'selfSiteNotify']); |
| @@ -593,6 +593,9 @@ Route::middleware(['bloginauth'])->group(function () { | @@ -593,6 +593,9 @@ Route::middleware(['bloginauth'])->group(function () { | ||
| 593 | Route::any('/setSort', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSort'])->name('extension_module_setSort'); | 593 | Route::any('/setSort', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSort'])->name('extension_module_setSort'); |
| 594 | Route::any('/setSearchParam', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSearchParam'])->name('extension_module_setSearchParam'); | 594 | Route::any('/setSearchParam', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSearchParam'])->name('extension_module_setSearchParam'); |
| 595 | Route::any('/delExtensionValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'delExtensionValue'])->name('extension_module_delExtensionValue'); | 595 | Route::any('/delExtensionValue', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'delExtensionValue'])->name('extension_module_delExtensionValue'); |
| 596 | + //2205项目单独处理 | ||
| 597 | + Route::any('2205/get2205List', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'get2205List'])->name('extension_module_get2205List'); | ||
| 598 | + Route::any('2205/save2205Status', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'save2205Status'])->name('extension_module_save2205Status'); | ||
| 596 | }); | 599 | }); |
| 597 | 600 | ||
| 598 | //自定义小语种文本信息 | 601 | //自定义小语种文本信息 |
-
请 注册 或 登录 后发表评论