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

@@ -53,7 +53,7 @@ class RankData extends BaseCommands
         }
         }
         foreach ($list as $item){
         foreach ($list as $item){
             try {
             try {
-                (new RankDataLogic())->syncRankData($item['api_no']);
+                (new RankDataLogic())->syncRankData($item['api_no'], $site_res);
             }catch (\Exception $e){
             }catch (\Exception $e){
                 LogUtils::info('rank_data error:' . $e->getMessage());
                 LogUtils::info('rank_data error:' . $e->getMessage());
                 $error++;
                 $error++;

@@ -152,4 +152,49 @@ class ATemplateController extends BaseController
         $aTemplateLogic->setTemplate();
         $aTemplateLogic->setTemplate();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 提供列表给提单后台， 路由没有任何中间件
+     * @param ATemplateLogic $aTemplateLogic
+     */
+    public function getTemplateList(ATemplateLogic $aTemplateLogic)
+    {
+        // 验证来源
+        $referer = request()->header('referer');
+        $referer = parse_url($referer, PHP_URL_HOST);
+        if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
+            $this->response('非法请求',Code::SYSTEM_ERROR, []);
+        }
+
+        $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
+        $result = [];
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $result[] = [
+                    'id' => $v['id'],
+                    'name' => 'name',
+
+                    'status' => 'status',
+                    'image_link' => getImageUrl($v['image']),
+                    'created_at' => $v['created_at']
+                ];
+            }
+        }
+        $this->response('success',Code::SUCCESS,$result);
+    }
+
+    /**
+     * 提供模板内容给提单后台， 路由没有任何中间件
+     * @param ATemplateLogic $aTemplateLogic
+     */
+    public function getTemplateDetail(ATemplateLogic $aTemplateLogic)
+    {
+        // 验证来源
+        $referer = request()->header('referer');
+        $referer = parse_url($referer, PHP_URL_HOST);
+        if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
+            $this->response('非法请求',Code::SYSTEM_ERROR, []);
+        }
+        $this->read($aTemplateLogic);
+    }
 }
 }

@@ -357,7 +357,7 @@ class RankDataLogic extends BaseLogic
      * @author zbj
      * @author zbj
      * @date 2023/9/20
      * @date 2023/9/20
      */
      */
-    public function syncRankData($api_no){
+    public function syncRankData($api_no, $site_res){
         $project_id = DeployOptimize::where('api_no', $api_no)->value('project_id');
         $project_id = DeployOptimize::where('api_no', $api_no)->value('project_id');
         $project = Project::find($project_id);
         $project = Project::find($project_id);
         if(!$project){
         if(!$project){

@@ -328,6 +328,9 @@ Route::group([], function () {
     Route::any('/getProjectByChannel', [Aside\Project\ProjectController::class, 'getProjectByChannel'])->name('admin.getProjectByChannel');//获取渠道商的项目
     Route::any('/getProjectByChannel', [Aside\Project\ProjectController::class, 'getProjectByChannel'])->name('admin.getProjectByChannel');//获取渠道商的项目
     // 提供接口 同步人事信息到5.0后台
     // 提供接口 同步人事信息到5.0后台
     Route::any('/get_hr_list', [Aside\Manage\HrController::class , 'getHrList'])->name('admin.get_hr_list');
     Route::any('/get_hr_list', [Aside\Manage\HrController::class , 'getHrList'])->name('admin.get_hr_list');
+    // 提供模板 提单后台查看
+    Route::any('get_template_list', [Aside\Template\ATemplateController::class, 'getTemplateList'])->name('admin.get_template_list');
+    Route::any('get_template_detail', [Aside\Template\ATemplateController::class, 'getTemplateDetail'])->name('admin.get_template_detail');
 });
 });