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

@@ -31,7 +31,8 @@ class OptimizeController extends BaseController
     public function lists(Project $project){
     public function lists(Project $project){
         $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
         $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
-            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id');
+            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+            ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
@@ -93,6 +94,10 @@ class OptimizeController extends BaseController
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
             'gl_project.cooperate_date AS cooperate_date',
             'gl_project.cooperate_date AS cooperate_date',
+            'gl_project_online_check.id AS online_check_id',
+            'gl_project_online_check.question AS question',
+            'gl_project_online_check.optimist_status AS optimist_status',
+            'gl_project_online_check.qa_status AS qa_status',
             'gl_project_payment.amount AS amount',
             'gl_project_payment.amount AS amount',
             'gl_project_deploy_build.dept_id AS dept_id',
             'gl_project_deploy_build.dept_id AS dept_id',
             'gl_project_deploy_build.keyword_num AS key',
             'gl_project_deploy_build.keyword_num AS key',
@@ -113,7 +118,6 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
-            'gl_project_payment.amount AS amount',
         ];
         ];
         return $select;
         return $select;
     }
     }

@@ -148,7 +148,6 @@ class ProjectController extends BaseController
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
-            'gl_project_payment.amount AS amount',
         ];
         ];
         return $select;
         return $select;
     }
     }

@@ -23,7 +23,8 @@ class ATemplateController extends BaseController
      * @time   :2023/6/28 16:34
      * @time   :2023/6/28 16:34
      */
      */
     public function lists(ATemplateLogic $aTemplateLogic){
     public function lists(ATemplateLogic $aTemplateLogic){
-        $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
+        $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
+        $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['image_link'] = getImageUrl($v['image']);
@@ -167,20 +168,21 @@ class ATemplateController extends BaseController
         }
         }
 
 
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
-        $result = [];
+        $data = [];
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $result[] = [
+                $data[] = [
                     'id' => $v['id'],
                     'id' => $v['id'],
-                    'name' => 'name',
-
-                    'status' => 'status',
+                    'name' => $v['name'],
+                    'status' => $v['status'],
                     'image_link' => getImageUrl($v['image']),
                     'image_link' => getImageUrl($v['image']),
                     'created_at' => $v['created_at']
                     'created_at' => $v['created_at']
                 ];
                 ];
             }
             }
         }
         }
-        $this->response('success',Code::SUCCESS,$result);
+        unset($lists['list']);
+        $lists['data'] = $data;
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     /**
     /**
@@ -195,6 +197,16 @@ class ATemplateController extends BaseController
         if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
         if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
         }
         }
-        $this->read($aTemplateLogic);
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $info = $aTemplateLogic->aTemplateRead();
+        $common = $aTemplateLogic->getHeadFooterList();
+        foreach ($common as $v) {
+            $info[$v['key']] = $v['values'];
+        }
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
 }
 }

@@ -23,7 +23,7 @@ class WebSettingImageController extends BaseController
      * @time   :2023/9/21 15:12
      * @time   :2023/9/21 15:12
      */
      */
     public function lists(WebSettingImage $webSettingImage){
     public function lists(WebSettingImage $webSettingImage){
-        $list = $webSettingImage->list();
+        $list = $webSettingImage->list([],'id',['id','image','type']);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 

@@ -23,7 +23,7 @@ class LoginAuthMiddleware
      */
      */
     public function handle(Request $request, Closure $next)
     public function handle(Request $request, Closure $next)
     {
     {
-        $manage = LoginLogic::manage();
+        $manage = Cache::get(Common::MANAGE_TOKEN . $request->header('token'));
         if (!$manage) {
         if (!$manage) {
             return response(['code'=> Code::USER_LOGIN_ERROE,'message'=>'当前用户未登录']);
             return response(['code'=> Code::USER_LOGIN_ERROE,'message'=>'当前用户未登录']);
         }
         }