周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 540b4f8d1fde72c35490009f6146569ff980c302 2 个父辈 4d57316c c2391c58

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 6 个修改的文件 包含 29 行增加 和 19 行删除
@@ -51,7 +51,7 @@ class UpdateRoute extends Command @@ -51,7 +51,7 @@ class UpdateRoute extends Command
51 */ 51 */
52 public function handle(){ 52 public function handle(){
53 $projectModel = new Project(); 53 $projectModel = new Project();
54 - $list = $projectModel->list(['id'=>209]); 54 + $list = $projectModel->list(['id'=>51]);
55 foreach ($list as $v){ 55 foreach ($list as $v){
56 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
57 ProjectServer::useProject($v['id']); 57 ProjectServer::useProject($v['id']);
@@ -17,6 +17,7 @@ use Illuminate\Console\Command; @@ -17,6 +17,7 @@ use Illuminate\Console\Command;
17 use Illuminate\Support\Facades\Cache; 17 use Illuminate\Support\Facades\Cache;
18 use Illuminate\Support\Facades\DB; 18 use Illuminate\Support\Facades\DB;
19 use Illuminate\Support\Facades\Redis; 19 use Illuminate\Support\Facades\Redis;
  20 +use Illuminate\Support\Str;
20 21
21 /** 22 /**
22 * 初始化项目 23 * 初始化项目
@@ -380,7 +381,14 @@ class UpdateSeoTdk extends Command @@ -380,7 +381,14 @@ class UpdateSeoTdk extends Command
380 { 381 {
381 $text = Gpt::instance()->openai_chat_qqs($prompt); 382 $text = Gpt::instance()->openai_chat_qqs($prompt);
382 $text = Common::deal_keywords($text); 383 $text = Common::deal_keywords($text);
383 - return Common::deal_str($text); 384 + $text = Common::deal_str($text);
  385 +
  386 + //包含这写字 重新生成
  387 + if(Str::contains(Str::lower($text), ['[your brand]', '[brand name]'])){
  388 + return $this->ai_send($prompt);
  389 + }
  390 +
  391 + return $text;
384 } 392 }
385 393
386 /** 394 /**
@@ -16,7 +16,7 @@ class Kernel extends ConsoleKernel @@ -16,7 +16,7 @@ class Kernel extends ConsoleKernel
16 protected function schedule(Schedule $schedule) 16 protected function schedule(Schedule $schedule)
17 { 17 {
18 // $schedule->command('inspire')->hourly(); 18 // $schedule->command('inspire')->hourly();
19 - $schedule->command('remain_day')->dailyAt('03:00')->withoutOverlapping(1); // 项目剩余服务时长 19 + $schedule->command('remain_day')->dailyAt('08:00')->withoutOverlapping(1); // 项目剩余服务时长
20 $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务 20 $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
21 $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次 21 $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
22 $schedule->command('rank_data_speed')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次 22 $schedule->command('rank_data_speed')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
@@ -178,6 +178,7 @@ class ProjectController extends BaseController @@ -178,6 +178,7 @@ class ProjectController extends BaseController
178 'gl_project_deploy_optimize.domain AS domain', 178 'gl_project_deploy_optimize.domain AS domain',
179 'gl_project_deploy_optimize.quality_mid AS quality_mid', 179 'gl_project_deploy_optimize.quality_mid AS quality_mid',
180 'gl_project_deploy_optimize.design_mid AS design_mid', 180 'gl_project_deploy_optimize.design_mid AS design_mid',
  181 + 'gl_project_deploy_optimize.api_no AS api_no',
181 ]; 182 ];
182 return $select; 183 return $select;
183 } 184 }
@@ -44,7 +44,7 @@ class CountLogic extends BaseLogic @@ -44,7 +44,7 @@ class CountLogic extends BaseLogic
44 //获取项目的剩余时长 44 //获取项目的剩余时长
45 $projectModel = new Project(); 45 $projectModel = new Project();
46 $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']); 46 $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
47 - $info['service_day'] = $projectInfo['remain_day']; 47 + $info['service_day'] = $this->project['deploy_build']['service_duration'] - $projectInfo['finish_remain_day'];
48 $info['compliance_day'] = $projectInfo['finish_remain_day']; 48 $info['compliance_day'] = $projectInfo['finish_remain_day'];
49 return $this->success($info); 49 return $this->success($info);
50 } 50 }
@@ -102,10 +102,9 @@ class ProjectServer @@ -102,10 +102,9 @@ class ProjectServer
102 * @time :2023/9/19 14:45 102 * @time :2023/9/19 14:45
103 */ 103 */
104 public static function saveInitParam($project_id){ 104 public static function saveInitParam($project_id){
105 - $created_at = date('Y-m-d H:i:s');  
106 - self::initGroup($project_id,$created_at); 105 + self::initGroup($project_id);
107 //初始化单页 106 //初始化单页
108 - self::init404Page($project_id,$created_at); 107 + self::init404Page($project_id);
109 //初始化模块数据 108 //初始化模块数据
110 self::initModule($project_id); 109 self::initModule($project_id);
111 DB::disconnect('custom_mysql'); 110 DB::disconnect('custom_mysql');
@@ -140,16 +139,17 @@ class ProjectServer @@ -140,16 +139,17 @@ class ProjectServer
140 * @method :post 139 * @method :post
141 * @time :2023/12/29 9:30 140 * @time :2023/12/29 9:30
142 */ 141 */
143 - public static function initGroup($project_id,$created_at){ 142 + public static function initGroup($project_id){
  143 + $time = date('Y-m-d H:i:s');
144 $info = DB::connection('custom_mysql')->table('gl_web_nav')->first(); 144 $info = DB::connection('custom_mysql')->table('gl_web_nav')->first();
145 if(empty($info)) { 145 if(empty($info)) {
146 $data = [ 146 $data = [
147 - ['project_id' => $project_id, 'name' => 'Home', 'url' => 'Home', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],  
148 - ['project_id' => $project_id, 'name' => 'Products', 'url' => 'Products', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],  
149 - ['project_id' => $project_id, 'name' => 'News', 'url' => 'News', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],  
150 - ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'about-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],  
151 - ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'contact-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],  
152 - ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'faq', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at], 147 + ['project_id' => $project_id, 'name' => 'Home', 'url' => 'Home', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
  148 + ['project_id' => $project_id, 'name' => 'Products', 'url' => 'Products', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
  149 + ['project_id' => $project_id, 'name' => 'News', 'url' => 'News', 'location' => 'header', 'group_id' => 1, 'created_at' => $time, 'updated_at' => $time],
  150 + ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'about-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
  151 + ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'contact-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
  152 + ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'faq', 'location' => 'footer', 'group_id' => 2, 'created_at' => $time, 'updated_at' => $time],
153 ]; 153 ];
154 DB::connection('custom_mysql')->table('gl_web_nav')->insert($data); 154 DB::connection('custom_mysql')->table('gl_web_nav')->insert($data);
155 } 155 }
@@ -157,8 +157,8 @@ class ProjectServer @@ -157,8 +157,8 @@ class ProjectServer
157 $info = DB::connection('custom_mysql')->table('gl_web_nav_group')->first(); 157 $info = DB::connection('custom_mysql')->table('gl_web_nav_group')->first();
158 if(empty($info)) { 158 if(empty($info)) {
159 $data = [ 159 $data = [
160 - ['id' => 1, 'project_id' => $project_id, 'name' => '全局顶部菜单', 'created_at' => $created_at, 'updated_at' => $created_at],  
161 - ['id' => 2, 'project_id' => $project_id, 'name' => '底部菜单', 'created_at' => $created_at, 'updated_at' => $created_at], 160 + ['id' => 1, 'project_id' => $project_id, 'name' => '全局顶部菜单', 'created_at' => $time, 'updated_at' => $time],
  161 + ['id' => 2, 'project_id' => $project_id, 'name' => '底部菜单', 'created_at' => $time, 'updated_at' => $time],
162 ]; 162 ];
163 DB::connection('custom_mysql')->table('gl_web_nav_group')->insert($data); 163 DB::connection('custom_mysql')->table('gl_web_nav_group')->insert($data);
164 } 164 }
@@ -172,7 +172,8 @@ class ProjectServer @@ -172,7 +172,8 @@ class ProjectServer
172 * @method :post 172 * @method :post
173 * @time :2023/12/29 9:32 173 * @time :2023/12/29 9:32
174 */ 174 */
175 - public function init404Page($project_id,$created_at){ 175 + public function init404Page($project_id){
  176 + $time = date('Y-m-d H:i:s');
176 $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first(); 177 $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
177 if(empty($info)) { 178 if(empty($info)) {
178 $main_404_html = '<main> 179 $main_404_html = '<main>
@@ -211,12 +212,12 @@ class ProjectServer @@ -211,12 +212,12 @@ class ProjectServer
211 'html_style' => '<style id="globalsojs-styles"></style>', 212 'html_style' => '<style id="globalsojs-styles"></style>',
212 'title' => '404-Page not found', 213 'title' => '404-Page not found',
213 'description' => 'Sorry. The page has either moved or cannot be found.', 214 'description' => 'Sorry. The page has either moved or cannot be found.',
214 - 'created_at' => $created_at, 'updated_at' => $created_at]; 215 + 'created_at' => $time, 'updated_at' => $time];
215 $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data); 216 $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
216 //路由 217 //路由
217 $info = DB::connection('custom_mysql')->table('gl_route_map')->first(); 218 $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
218 if(empty($info)) { 219 if(empty($info)) {
219 - $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => BCustomTemplate::NOT_FOUND_PAGE_URL, 'created_at' => $created_at, 'updated_at' => $created_at]; 220 + $data = ['project_id' => $project_id, 'source' => RouteMap::SOURCE_PAGE, 'source_id' => $id, 'route' => BCustomTemplate::NOT_FOUND_PAGE_URL, 'created_at' => $time, 'updated_at' => $time];
220 DB::connection('custom_mysql')->table('gl_route_map')->insert($data); 221 DB::connection('custom_mysql')->table('gl_route_map')->insert($data);
221 } 222 }
222 } 223 }