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

刘锟
app/Console/Commands/DayCount/Count.php
app/Console/Commands/Test/UpdateRoute.php
app/Console/Kernel.php
app/Helper/helper.php
app/Http/Controllers/Aside/Devops/ServersController.php
app/Http/Controllers/Aside/Devops/ServersIpController.php
app/Http/Controllers/Aside/Template/ATemplateModuleController.php
app/Http/Logic/Aside/Devops/ServersIpLogic.php
app/Http/Logic/Aside/Template/ATemplateModuleLogic.php
app/Http/Logic/Aside/User/UserLogic.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Models/RouteMap/RouteMap.php
routes/aside.php
--- a/app/Console/Commands/DayCount/Count.php
查看文件 @3a23831
+++ b/app/Console/Commands/DayCount/Count.php
查看文件 @3a23831
@@ -50,11 +50,11 @@ class Count extends Command
         try {
             if(!empty($list)){
                 $list = $list->toArray();
-                $data = [];
                 $yesterday = Carbon::yesterday()->toDateString();
                 $domainInfo = new DomainInfo();
                 foreach ($list as $v){
                     $v = (array)$v;
+                    echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
                     if($v['type'] == Project::TYPE_ZERO){
                         continue;
                     }
@@ -76,7 +76,7 @@ class Count extends Command
                     //服务达标天数
                     $arr['compliance_day'] = $v['finish_remain_day'];
                     //剩余服务时常
-                    $arr['service_day'] = $v['remain_day'] - 1;
+                    $arr['service_day'] = ($v['remain_day'] - 1) < 0 ? 0: $v['remain_day'] - 1;
                     //项目id
                     $arr['project_id'] = $v['project_id'];
                     $arr['created_at'] = date('Y-m-d H:i:s');
@@ -84,9 +84,16 @@ class Count extends Command
                     //询盘统计
                     $arr = $this->inquiry($arr,$v['test_domain'], $v['id']);
                     if($arr === false){
-                        $data[] = $v['test_domain'];
+                        continue;
                     }
+                    //查询当天数据是否存在  存在则更新
+                    $countModel = new \App\Models\HomeCount\Count();
+                    $info = $countModel->read(['date'=>$arr['date'],'project_id'=>$v['id']]);
+                    if($info === false){
                         DB::table('gl_count')->insert($arr);
+                    }else{
+                        $countModel->edit($arr,['id'=>$info['id']]);
+                    }
                     Log::channel('day_count')->error('日期：'.$arr['created_at'].'success: ' .$v['test_domain']);
                 }
             }
--- a/app/Console/Commands/Test/UpdateRoute.php
查看文件 @3a23831
+++ b/app/Console/Commands/Test/UpdateRoute.php
查看文件 @3a23831
@@ -59,8 +59,8 @@ class UpdateRoute extends Command
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-            $this->getProduct();
-//            $this->setProductKeyword();
+//            $this->getProduct();
+            $this->setProductKeyword();
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
--- a/app/Console/Kernel.php
查看文件 @3a23831
+++ b/app/Console/Kernel.php
查看文件 @3a23831
@@ -21,14 +21,14 @@ class Kernel extends ConsoleKernel
         // $schedule->command('inspire')->hourly();
         $schedule->command('remain_day')->dailyAt('09:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
-        $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-        $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-        $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
-        $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-        $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-        $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
-        $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-        $schedule->command('rank_data_week')->weeklyOn([1,2], '08:30')->withoutOverlapping(1); // 排名数据，每周一、二早上执行一次
+//        $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
+//        $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
+//        $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
+//        $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+//        $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+//        $schedule->command('rank_data_indexed_pages')->dailyAt('07:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
+//        $schedule->command('rank_data_recomm_domain')->dailyAt('07:40')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
+//        $schedule->command('rank_data_week')->weeklyOn([1,2], '08:30')->withoutOverlapping(1); // 排名数据，每周一、二早上执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
         $schedule->command('web_traffic_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
         $schedule->command('web_traffic_russia_special')->everyMinute()->withoutOverlapping(1); // 特殊引流
--- a/app/Helper/helper.php
查看文件 @3a23831
+++ b/app/Helper/helper.php
查看文件 @3a23831
@@ -23,8 +23,7 @@ define('HTTP_OPENAI_URL', 'http://openai.waimaoq.com/');
 if (!function_exists('generateRoute')) {
     function generateRoute($string)
     {
-        //TODO::html结尾，htm结尾，只处理.htm前面的内容
-        return trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-');
+        return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
     }
 }
--- a/app/Http/Controllers/Aside/Devops/ServersController.php
查看文件 @3a23831
+++ b/app/Http/Controllers/Aside/Devops/ServersController.php
查看文件 @3a23831
@@ -28,6 +28,7 @@ class ServersController extends BaseController
         if(isset($this->map['server_name']) && !empty($this->map['server_name'])){
             $this->map['server_name'] = ['like','%'.$this->map['server_name'].'%'];
         }
+        $this->map['status'] = 0;
         $serversModel = new ServersModel();
         $lists = $serversModel->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
--- a/app/Http/Controllers/Aside/Devops/ServersIpController.php
查看文件 @3a23831
+++ b/app/Http/Controllers/Aside/Devops/ServersIpController.php
查看文件 @3a23831
@@ -101,6 +101,7 @@ class ServersIpController extends BaseController
      * @time   :2024/6/24 16:24
      */
     public function save(ServersIpLogic $serversIpLogic){
+        if(!isset($this->param['id'])){
             $this->request->validate([
                 'ip'=>'required',
                 'servers_id'=>'required',
@@ -110,6 +111,7 @@ class ServersIpController extends BaseController
                 'servers_id.required' => '服务器servers_id不能为空',
                 'domain.required' => 'cname域名不能为空',
             ]);
+        }
         $data = $serversIpLogic->saveServersIp();
         $this->response('success',Code::SUCCESS,$data);
     }
--- a/app/Http/Controllers/Aside/Template/ATemplateModuleController.php
查看文件 @3a23831
+++ b/app/Http/Controllers/Aside/Template/ATemplateModuleController.php
查看文件 @3a23831
@@ -121,4 +121,21 @@ class ATemplateModuleController extends BaseController
         $list = $project->list($this->map,'id',['id','title']);
         $this->response('success',Code::SUCCESS,$list);
     }
+
+    /**
+     * @remark :修改审核状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:42
+     */
+    public function auditingStatus(ATemplateModuleLogic $ATemplateModuleLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $data = $ATemplateModuleLogic->auditingStatus();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
--- a/app/Http/Logic/Aside/Devops/ServersIpLogic.php
查看文件 @3a23831
+++ b/app/Http/Logic/Aside/Devops/ServersIpLogic.php
查看文件 @3a23831
@@ -49,10 +49,12 @@ class ServersIpLogic extends BaseLogic
      */
     public function saveServersIp(){
         //验证域名是否唯一
+        if(!isset($this->param['id'])){
             $info = $this->model->read(['domain'=>$this->param['domain']]);
             if($info !== false){
                 $this->fail('当前初始域名已存在');
             }
+        }
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$this->param['id']]);
--- a/app/Http/Logic/Aside/Template/ATemplateModuleLogic.php
查看文件 @3a23831
+++ b/app/Http/Logic/Aside/Template/ATemplateModuleLogic.php
查看文件 @3a23831
@@ -100,4 +100,19 @@ class ATemplateModuleLogic extends BaseLogic
         return $this->success();
     }
+    /**
+     * @remark :修改状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:44
+     */
+    public function auditingStatus(){
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('修改失败，请联系管理员');
+        }
+        return $this->success(['id'=>$this->param['id']]);
+    }
+
 }
--- a/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @3a23831
+++ b/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @3a23831
@@ -68,7 +68,7 @@ class UserLogic extends BaseLogic
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
         } else {
-            $this->param['password'] = base64_encode(md5($this->param['password']));
+            $this->param['password'] = base64_encode(md5($this->param['password'] ?? '123456'));
             $rs = $this->model->add($this->param);
         }
         if ($rs === false) {
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @3a23831
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @3a23831
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @3a23831
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @3a23831
@@ -59,9 +59,6 @@ class NewsLogic extends BaseLogic
      */
     public function newsSave()
     {
-        //拼接参数
-//        DB::beginTransaction();
-//        try {
         $this->param = $this->paramProcessing($this->param);
         if (isset($this->param['id']) && !empty($this->param['id'])) {
             $id = $this->param['id'];
@@ -79,12 +76,6 @@ class NewsLogic extends BaseLogic
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
             $this->edit(['url' => $route], ['id' => $id]);
         }
-//            //更新路由
-//            DB::commit();
-//        } catch (\Exception $e) {
-//            DB::rollBack();
-//            $this->fail('系统错误，请联系管理员');
-//        }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         return $this->success(['id'=>$id]);
@@ -223,10 +214,10 @@ class NewsLogic extends BaseLogic
      */
     public function getCategory($category){
         $str = '';
-        if(is_array($category) && $category){
-            $str = ','.implode(',',$category).',';
+        foreach ($category as $v){
+            $str .= $v.',';
         }
-        return $str;
+        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
     /**
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @3a23831
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @3a23831
@@ -55,11 +55,10 @@ class RouteMap extends Base
     public static function generateRoute($title, $source, $source_id, $project_id){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
             $title = Translate::tran($title, 'en');
-        }else{
+        }
         if(contains_russian($title)){
             $title = Translate::tran($title, 'en');
         }
-        }
         $i=1;
         $sign = generateRoute($title);
         $length = strlen($sign);
--- a/routes/aside.php
查看文件 @3a23831
+++ b/routes/aside.php
查看文件 @3a23831
@@ -373,6 +373,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
             Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
+            Route::any('/auditingStatus', [Aside\Template\ATemplateModuleController::class, 'auditingStatus'])->name('admin.ATemplateModule_auditingStatus');
             Route::any('/getProjectList', [Aside\Template\ATemplateModuleController::class, 'getProjectList'])->name('admin.ATemplateModule_getProjectList');
         });
         //设置类型