gx

@@ -46,23 +46,6 @@ class CNoticeController extends BaseController
         ];
         http_post($url, json_encode($param));
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
-//        $updateProgressModel = new UpdateProgress();
-//        $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();
-//        if((!empty($progressInfo))){
-//            $progressInfo = $progressInfo->toArray();
-//            if(($progressInfo['total_num'] > $progressInfo['current_num'])){
-//                $this->response('当前页面正在生成了，请完成后再点击',Code::SUCCESS,$progressInfo);
-//            }
-//        }
-//        //通知更新
-//        if($this->param['type'] == UpdateNotify::TYPE_MASTER){
-//            $this->updateMaster();
-//        }else{
-//            $this->updateMinorLanguages();
-//        }
-//        $urlStr = $this->getString($this->param['type'],$this->param['page']);
-//        curlGet($urlStr);
-//        $this->response('更新成功');
     }
 
     /**

@@ -35,13 +35,6 @@ class ComController extends BaseController
             $this->map = $this->getAdminMenuCondition();
         }
         $lists = $projectMenuModel->list($this->map,'sort');
-        foreach ($lists as $k => $v){
-            if(empty($this->user['is_upload_manage'])){
-                if($v['rules'] == '/fileUpload'){
-                    unset($lists[$k]);
-                }
-            }
-        }
         $menu = array();
         foreach ($lists as $k => $v){
             $v = (array)$v;
@@ -107,6 +100,10 @@ class ComController extends BaseController
                 $info['role_menu'] = trim(str_replace(',16,',',',','.$info['role_menu'].','),',');
                 $info['role_menu'] = trim(str_replace(',17,',',',','.$info['role_menu'].','),',');
             }
+            $uploadCode = $this->getIsUpload();
+            if($uploadCode != 1){
+                $info['role_menu'] = trim(str_replace(',41,',',',','.$info['role_menu'].','),',');
+            }
             $this->map = [
                 'status'=>0,
                 'is_role'=>0,
@@ -135,6 +132,10 @@ class ComController extends BaseController
             $data[] = 16;
             $data[] = 17;
         }
+        $uploadCode = $this->getIsUpload();
+        if($uploadCode != 1){
+            $data[] = 41;
+        }
         if(!empty($data)){
             $this->map['id'] = ['not in',$data];
         }
@@ -165,6 +166,20 @@ class ComController extends BaseController
     }
 
     /**
+     * @remark :是否开启上传配置
+     * @name   :getIsUpload
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/19 17:22
+     */
+    public function getIsUpload(){
+        if($this->user['is_upload_manage'] != 0){
+            return 1;
+        }
+        return 0;
+    }
+
+    /**
      * @remark :是否显示博客
      * @name   :getIsBlog
      * @author :lyh
@@ -172,9 +187,7 @@ class ComController extends BaseController
      * @time   :2023/12/19 16:44
      */
     public function getIsBlog(){
-        $projectModel = new Project();
-        $info = $projectModel->read(['id'=>$this->user['project_id']]);
-        if($info['is_show_blog'] != 0){
+        if($this->user['is_show_blog'] != 0){
             return 1;//不显示
         }
         return 0;

@@ -165,6 +165,7 @@ class UserLoginLogic
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         $info['is_customized'] = $project['is_customized'];
         $info['is_upload_manage'] = $project['is_upload_manage'];
+        $info['is_show_blog'] = $project['is_show_blog'];
         $info['upload_config'] = $project['upload_config'];
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['image_max'] = $project['image_max'];
@@ -200,6 +201,7 @@ class UserLoginLogic
             ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         $info['is_customized'] = $project['is_customized'];
         $info['is_upload_manage'] = $project['is_upload_manage'];
+        $info['is_show_blog'] = $project['is_show_blog'];
         $info['upload_config'] = $project['upload_config'];
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['image_max'] = $project['image_max'];