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

@@ -79,6 +79,13 @@ class RoleMenuController extends BaseController
         $this->response('success');
     }
 
+    /**
+     * @remark :删除权限菜单
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/26 9:18
+     */
     public function del(MenuLogic $menuLogic){
         $this->request->validate([
             'id'=>'required'

@@ -18,6 +18,12 @@ class BTemplateController extends BaseController
      */
     public function publicTemplateLists(BTemplateLogic $BTemplateLogic){
         $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->page,$this->row,$this->order);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => &$v){
+                $v['image_link'] = $this->getImageUrl($v['image']);
+                $lists['list'][$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
     }
 

@@ -54,7 +54,7 @@ class UserLoginLogic
             $this->fail('系统错误，请联系管理员');
         }
         //写入日志
-        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]);
+        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),'project_id'=>$info['project_id']]);
         return $this->success($info);
     }
 
@@ -68,23 +68,23 @@ class UserLoginLogic
         $current_url = url()->current();
         $refer_url = url()->previous();
         if ($current_url == $refer_url) {
-            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' - -|' . $refer_url]);
+            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' - -|' . $refer_url]);
             echo ' - -';
             exit;
         }
         if (strpos($refer_url, 'www.quanqiusou.cn') === false && strpos($refer_url, 'crm.globalso.com') === false && strpos($refer_url, 'crm.globalso.com') === false) {
-            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 来源错误|' . $refer_url]);
+            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 来源错误|' . $refer_url]);
             echo '来源错误';
             exit;
         }
         if (!$this->param['project_id']) {
-            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 没有传入链接|' . $refer_url]);
+            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 没有传入链接|' . $refer_url]);
             echo '没有连接';
             exit;
         }
         $has_user = User::where('project_id', $this->param['project_id'])->orderBy('id', 'asc')->first();
         if (empty($has_user->id)) {
-            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?: 0,'remark' => ' 该项目未找到注册账号|' . $refer_url]);
+            Common::set_user_login(['user_id'=>0, 'ip'=>request()->ip(), 'project_id' => $this->param['project_id'] ?? 0,'remark' => ' 该项目未找到注册账号|' . $refer_url]);
             echo '该项目未找到注册账号';
             exit;
         }