周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 b8d3e199a68429aebbd908bcc8e3a3ad11af7f33 2 个父辈 53e8c81d 855f4e37

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 5 行删除
@@ -79,6 +79,13 @@ class RoleMenuController extends BaseController @@ -79,6 +79,13 @@ class RoleMenuController extends BaseController
79 $this->response('success'); 79 $this->response('success');
80 } 80 }
81 81
  82 + /**
  83 + * @remark :删除权限菜单
  84 + * @name :del
  85 + * @author :lyh
  86 + * @method :post
  87 + * @time :2023/7/26 9:18
  88 + */
82 public function del(MenuLogic $menuLogic){ 89 public function del(MenuLogic $menuLogic){
83 $this->request->validate([ 90 $this->request->validate([
84 'id'=>'required' 91 'id'=>'required'
@@ -18,6 +18,12 @@ class BTemplateController extends BaseController @@ -18,6 +18,12 @@ class BTemplateController extends BaseController
18 */ 18 */
19 public function publicTemplateLists(BTemplateLogic $BTemplateLogic){ 19 public function publicTemplateLists(BTemplateLogic $BTemplateLogic){
20 $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->page,$this->row,$this->order); 20 $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->page,$this->row,$this->order);
  21 + if(!empty($lists) && !empty($lists['list'])){
  22 + foreach ($lists['list'] as $k => &$v){
  23 + $v['image_link'] = $this->getImageUrl($v['image']);
  24 + $lists['list'][$k] = $v;
  25 + }
  26 + }
21 $this->response('success',Code::SUCCESS,$lists); 27 $this->response('success',Code::SUCCESS,$lists);
22 } 28 }
23 29
@@ -54,7 +54,7 @@ class UserLoginLogic @@ -54,7 +54,7 @@ class UserLoginLogic
54 $this->fail('系统错误，请联系管理员'); 54 $this->fail('系统错误，请联系管理员');
55 } 55 }
56 //写入日志 56 //写入日志
57 - Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]); 57 + Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),'project_id'=>$info['project_id']]);
58 return $this->success($info); 58 return $this->success($info);
59 } 59 }
60 60
@@ -68,23 +68,23 @@ class UserLoginLogic @@ -68,23 +68,23 @@ class UserLoginLogic
68 $current_url = url()->current(); 68 $current_url = url()->current();
69 $refer_url = url()->previous(); 69 $refer_url = url()->previous();
70 if ($current_url == $refer_url) { 70 if ($current_url == $refer_url) {
71 - Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' - -|' . $refer_url]); 71 + Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' - -|' . $refer_url]);
72 echo ' - -'; 72 echo ' - -';
73 exit; 73 exit;
74 } 74 }
75 if (strpos($refer_url, 'www.quanqiusou.cn') === false && strpos($refer_url, 'crm.globalso.com') === false && strpos($refer_url, 'crm.globalso.com') === false) { 75 if (strpos($refer_url, 'www.quanqiusou.cn') === false && strpos($refer_url, 'crm.globalso.com') === false && strpos($refer_url, 'crm.globalso.com') === false) {
76 - Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 来源错误|' . $refer_url]); 76 + Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 来源错误|' . $refer_url]);
77 echo '来源错误'; 77 echo '来源错误';
78 exit; 78 exit;
79 } 79 }
80 if (!$this->param['project_id']) { 80 if (!$this->param['project_id']) {
81 - Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 没有传入链接|' . $refer_url]); 81 + Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 没有传入链接|' . $refer_url]);
82 echo '没有连接'; 82 echo '没有连接';
83 exit; 83 exit;
84 } 84 }
85 $has_user = User::where('project_id', $this->param['project_id'])->orderBy('id', 'asc')->first(); 85 $has_user = User::where('project_id', $this->param['project_id'])->orderBy('id', 'asc')->first();
86 if (empty($has_user->id)) { 86 if (empty($has_user->id)) {
87 - Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 该项目未找到注册账号|' . $refer_url]); 87 + Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 该项目未找到注册账号|' . $refer_url]);
88 echo '该项目未找到注册账号'; 88 echo '该项目未找到注册账号';
89 exit; 89 exit;
90 } 90 }