Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 450;
+        $project_id = 759;
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');

@@ -36,7 +36,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 450;
+        $project_id = 759;
         $oldModel = new UpdateOldInfo();
         $oldModel = new UpdateOldInfo();
         $info = $oldModel->read(['project_id'=>$project_id]);
         $info = $oldModel->read(['project_id'=>$project_id]);
         $url = $info['old_domain_online'];
         $url = $info['old_domain_online'];

@@ -50,14 +50,21 @@ class RankDataTask extends Command
     public function handle()
     public function handle()
     {
     {
         $list = NoticeLog::where('type', NoticeLog::TYPE_RANK_DATA)->where('status', NoticeLog::STATUS_PENDING)->get();
         $list = NoticeLog::where('type', NoticeLog::TYPE_RANK_DATA)->where('status', NoticeLog::STATUS_PENDING)->get();
-        foreach ($list as $item){
+        foreach ($list as $item) {
             echo 'start:' . $item['id'] . PHP_EOL;
             echo 'start:' . $item['id'] . PHP_EOL;
-            try {
+            $error_msg = [];
             $rankDataLogic = new RankDataLogic();
             $rankDataLogic = new RankDataLogic();
+            try {
                 //排名数据
                 //排名数据
                 $api = new QuanqiusouApi();
                 $api = new QuanqiusouApi();
                 $site_res = $api->getSiteRes();
                 $site_res = $api->getSiteRes();
                 $rankDataLogic->syncRankData($item['data']['api_no'], $site_res, true);
                 $rankDataLogic->syncRankData($item['data']['api_no'], $site_res, true);
+            } catch (\Exception $e) {
+                Log::channel('rank_data')->error('排名数据更新失败' . $e->getMessage(), $item->toArray());
+                $error_msg[] = $e->getMessage();
+            }
+
+            try {
                 //外链数据
                 //外链数据
                 $rankDataLogic->syncExternalLinks($item['data']['api_no'], true);
                 $rankDataLogic->syncExternalLinks($item['data']['api_no'], true);
                 //外链引荐域名
                 //外链引荐域名
@@ -70,10 +77,14 @@ class RankDataTask extends Command
                 $item->status = NoticeLog::STATUS_SUCCESS;
                 $item->status = NoticeLog::STATUS_SUCCESS;
                 $item->save();
                 $item->save();
                 echo 'success:' . $item['id'] . PHP_EOL;
                 echo 'success:' . $item['id'] . PHP_EOL;
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL;
                 echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL;
-                Log::channel('rank_data')->error('排名数据更新失败' . $e->getMessage(), $item);
-                $this->retry($item, $e->getMessage());
+                Log::channel('rank_data')->error('排名数据更新失败' . $e->getMessage(), $item->toArray());
+                $error_msg[] = $e->getMessage();
+            }
+
+            if($error_msg){
+                $this->retry($item, implode(',', $error_msg));
             }
             }
         }
         }
     }
     }

@@ -12,6 +12,7 @@ use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
+use App\Models\Manage\ManageHr;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RankData\RankData;
 use App\Models\RankData\RankData;
@@ -88,7 +89,7 @@ class OptimizeController extends BaseController
         if($item['type'] != Project::TYPE_ZERO){
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         }
-        $manageModel = new Manage();
+        $manageModel = new ManageHr();
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);

@@ -94,33 +94,16 @@ class TranslateController extends BaseController
         $routeMapModel = new RouteMap();
         $routeMapModel = new RouteMap();
         $list = $routeMapModel->list();
         $list = $routeMapModel->list();
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
-            switch ($v['source']){
-                case RouteMap::SOURCE_INDEX:
-                   $data[] = $this->user['domain'];
-                   break;
-                case RouteMap::SOURCE_PRODUCT:
-                    $data[] = $this->user['domain'].$v['route'].'/';
-                    break;
-                case RouteMap::SOURCE_PRODUCT_CATE:
-                    //todo::查看当前有好多页
-                    $data[] = $this->user['domain'].$v['route'].'/';
-                    break;
-                case RouteMap::SOURCE_BLOG:
-                    $data[] = $this->user['domain'].$v['path'].'/'.$v['route'].'/';
-                    break;
-                case RouteMap::SOURCE_BLOG_CATE:
-                    $data[] = $this->user['domain'].RouteMap::PATH_BLOG_CATE.'/'.$v['route'].'/';
-                    break;
-                case RouteMap::SOURCE_NEWS:
-                    $data[] = $this->user['domain'].$v['path'].'/'.$v['route'].'/';
-                    break;
-                case RouteMap::SOURCE_BLOG_CATE:
-                    $data[] = $this->user['domain'].RouteMap::PATH_NEWS_CATE.'/'.$v['route'].'/';
-                    break;
-                default:
-                    $data[] = $this->user['domain'].$v['route'].'/';
-                    break;
+            if(!empty($v['path'])){
+                if($v['path'] == 'blog'){
+                    $v['path'] = $v['path'].'s';
                 }
                 }
+                $route = $v['path'].'/'.$v['route'];
+            }else{
+                $route = $v['route'];
             }
             }
+            $data[] = $this->user['domain'].$route;
+        }
+        return $this->success($data);
     }
     }
 }
 }

@@ -179,4 +179,22 @@ class ManageHr extends Base
     {
     {
         return $this->dept->name;
         return $this->dept->name;
     }
     }
+
+    /**
+     * @remark :获取用户名称
+     * @name   :getName
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/18 14:41
+     */
+    public function getName($id){
+        $name = '';
+        if(!empty($id)){
+            $info = $this->read(['id'=>$id],['id','name']);
+            if($info !== false){
+                $name = $info['name'];
+            }
+        }
+        return $name;
+    }
 }
 }

@@ -181,6 +181,7 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'lists'])->name('translate_check_lists');
             Route::any('/', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'lists'])->name('translate_check_lists');
             Route::any('/imageList', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'imageList'])->name('translate_checkg_imageList');
             Route::any('/imageList', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'imageList'])->name('translate_checkg_imageList');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'save'])->name('translate_check_save');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'save'])->name('translate_check_save');
+            Route::any('/getUrl', [\App\Http\Controllers\Bside\Setting\TranslateController::class, 'getUrl'])->name('translate_check_getUrl');
         });
         });
         //seo设置
         //seo设置
         Route::prefix('seo')->group(function () {
         Route::prefix('seo')->group(function () {