周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 e1e1de87d34f29db5e868ba03bfd691d2cca586d 1 个父辈 38f07c0a

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 25 行增加 和 27 行删除
@@ -46,23 +46,6 @@ class CNoticeController extends BaseController @@ -46,23 +46,6 @@ class CNoticeController extends BaseController
46 ]; 46 ];
47 http_post($url, json_encode($param)); 47 http_post($url, json_encode($param));
48 $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！'); 48 $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
49 -// $updateProgressModel = new UpdateProgress();  
50 -// $progressInfo = $updateProgressModel->formatQuery(['project_id'=>$this->user['project_id'],'type'=>$this->param['type']])->orderBy('id','desc')->first();  
51 -// if((!empty($progressInfo))){  
52 -// $progressInfo = $progressInfo->toArray();  
53 -// if(($progressInfo['total_num'] > $progressInfo['current_num'])){  
54 -// $this->response('当前页面正在生成了，请完成后再点击',Code::SUCCESS,$progressInfo);  
55 -// }  
56 -// }  
57 -// //通知更新  
58 -// if($this->param['type'] == UpdateNotify::TYPE_MASTER){  
59 -// $this->updateMaster();  
60 -// }else{  
61 -// $this->updateMinorLanguages();  
62 -// }  
63 -// $urlStr = $this->getString($this->param['type'],$this->param['page']);  
64 -// curlGet($urlStr);  
65 -// $this->response('更新成功');  
66 } 49 }
67 50
68 /** 51 /**
@@ -35,13 +35,6 @@ class ComController extends BaseController @@ -35,13 +35,6 @@ class ComController extends BaseController
35 $this->map = $this->getAdminMenuCondition(); 35 $this->map = $this->getAdminMenuCondition();
36 } 36 }
37 $lists = $projectMenuModel->list($this->map,'sort'); 37 $lists = $projectMenuModel->list($this->map,'sort');
38 - foreach ($lists as $k => $v){  
39 - if(empty($this->user['is_upload_manage'])){  
40 - if($v['rules'] == '/fileUpload'){  
41 - unset($lists[$k]);  
42 - }  
43 - }  
44 - }  
45 $menu = array(); 38 $menu = array();
46 foreach ($lists as $k => $v){ 39 foreach ($lists as $k => $v){
47 $v = (array)$v; 40 $v = (array)$v;
@@ -107,6 +100,10 @@ class ComController extends BaseController @@ -107,6 +100,10 @@ class ComController extends BaseController
107 $info['role_menu'] = trim(str_replace(',16,',',',','.$info['role_menu'].','),','); 100 $info['role_menu'] = trim(str_replace(',16,',',',','.$info['role_menu'].','),',');
108 $info['role_menu'] = trim(str_replace(',17,',',',','.$info['role_menu'].','),','); 101 $info['role_menu'] = trim(str_replace(',17,',',',','.$info['role_menu'].','),',');
109 } 102 }
  103 + $uploadCode = $this->getIsUpload();
  104 + if($uploadCode != 1){
  105 + $info['role_menu'] = trim(str_replace(',41,',',',','.$info['role_menu'].','),',');
  106 + }
110 $this->map = [ 107 $this->map = [
111 'status'=>0, 108 'status'=>0,
112 'is_role'=>0, 109 'is_role'=>0,
@@ -135,6 +132,10 @@ class ComController extends BaseController @@ -135,6 +132,10 @@ class ComController extends BaseController
135 $data[] = 16; 132 $data[] = 16;
136 $data[] = 17; 133 $data[] = 17;
137 } 134 }
  135 + $uploadCode = $this->getIsUpload();
  136 + if($uploadCode != 1){
  137 + $data[] = 41;
  138 + }
138 if(!empty($data)){ 139 if(!empty($data)){
139 $this->map['id'] = ['not in',$data]; 140 $this->map['id'] = ['not in',$data];
140 } 141 }
@@ -165,6 +166,20 @@ class ComController extends BaseController @@ -165,6 +166,20 @@ class ComController extends BaseController
165 } 166 }
166 167
167 /** 168 /**
  169 + * @remark :是否开启上传配置
  170 + * @name :getIsUpload
  171 + * @author :lyh
  172 + * @method :post
  173 + * @time :2023/12/19 17:22
  174 + */
  175 + public function getIsUpload(){
  176 + if($this->user['is_upload_manage'] != 0){
  177 + return 1;
  178 + }
  179 + return 0;
  180 + }
  181 +
  182 + /**
168 * @remark :是否显示博客 183 * @remark :是否显示博客
169 * @name :getIsBlog 184 * @name :getIsBlog
170 * @author :lyh 185 * @author :lyh
@@ -172,9 +187,7 @@ class ComController extends BaseController @@ -172,9 +187,7 @@ class ComController extends BaseController
172 * @time :2023/12/19 16:44 187 * @time :2023/12/19 16:44
173 */ 188 */
174 public function getIsBlog(){ 189 public function getIsBlog(){
175 - $projectModel = new Project();  
176 - $info = $projectModel->read(['id'=>$this->user['project_id']]);  
177 - if($info['is_show_blog'] != 0){ 190 + if($this->user['is_show_blog'] != 0){
178 return 1;//不显示 191 return 1;//不显示
179 } 192 }
180 return 0; 193 return 0;
@@ -165,6 +165,7 @@ class UserLoginLogic @@ -165,6 +165,7 @@ class UserLoginLogic
165 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 165 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
166 $info['is_customized'] = $project['is_customized']; 166 $info['is_customized'] = $project['is_customized'];
167 $info['is_upload_manage'] = $project['is_upload_manage']; 167 $info['is_upload_manage'] = $project['is_upload_manage'];
  168 + $info['is_show_blog'] = $project['is_show_blog'];
168 $info['upload_config'] = $project['upload_config']; 169 $info['upload_config'] = $project['upload_config'];
169 $info['main_lang_id'] = $project['main_lang_id']; 170 $info['main_lang_id'] = $project['main_lang_id'];
170 $info['image_max'] = $project['image_max']; 171 $info['image_max'] = $project['image_max'];
@@ -200,6 +201,7 @@ class UserLoginLogic @@ -200,6 +201,7 @@ class UserLoginLogic
200 ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 201 ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
201 $info['is_customized'] = $project['is_customized']; 202 $info['is_customized'] = $project['is_customized'];
202 $info['is_upload_manage'] = $project['is_upload_manage']; 203 $info['is_upload_manage'] = $project['is_upload_manage'];
  204 + $info['is_show_blog'] = $project['is_show_blog'];
203 $info['upload_config'] = $project['upload_config']; 205 $info['upload_config'] = $project['upload_config'];
204 $info['main_lang_id'] = $project['main_lang_id']; 206 $info['main_lang_id'] = $project['main_lang_id'];
205 $info['image_max'] = $project['image_max']; 207 $info['image_max'] = $project['image_max'];