wesmiler

app/Http/Controllers/Api/v1/IndexController.php

@@ -34,6 +34,7 @@ class IndexController extends webApp
         RedisService::set("caches:temp:st_index_".$this->userId, ['params'=>$params,'st'=>$st], 600);
         $cacheKey = "caches:index:datas:".$this->userId;
         $datas = RedisService::get($cacheKey);
+        return message(1010, true, []);
         if($datas){
             $end = microtime(true);
             RedisService::set("caches:temp:end_index_".$this->userId, ['params'=>$params,'end'=>($end-$st)], 600);

app/Services/Common/UserService.php

@@ -63,7 +63,35 @@ class UserService extends BaseService
         if ($gender) {
             $map[] = ['gender', '=', $gender];
         }
-        return parent::getList($map); // TODO: Change the autogenerated stub
+
+        $list = [];
+        $count = $this->model->where($map)->count();
+        if($count>0){
+            $offset = (PAGE - 1) * PERPAGE;
+            $list = $this->model->where($map)->select(['*'])->offset($offset)->limit(PERPAGE)->orderBy('id', 'desc')->get();
+            if ($list) {
+                foreach ($list as &$item) {
+                    $item['create_time'] = $item['create_time'] ? datetime($item['create_time']) : '';
+                    $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
+                    if ($item['gender']) {
+                        $item['gender_name'] = config('admin.gender_list')[$item['gender']];
+                    }
+
+                    // 获取用户角色列表
+                    $userRoleService = new UserRoleService();
+                    $roleList = $userRoleService->getUserRoleList($item['id']);
+                    $item['roles'] = $roleList;
+                }
+            }
+        }
+
+        $message = array(
+            "msg" => '操作成功',
+            "code" => 0,
+            "data" => $list ?? [],
+            "count" => $count,
+        );
+        return $message;
     }
 
     /**
@@ -104,13 +132,14 @@ class UserService extends BaseService
             }
         }
 
+        if(!isset($data['role_ids']) || empty($data['role_ids'])){
+            return message('请选择权限角色', false);
+        }
 
         // 头像处理
         $avatar = isset($data['avatar']) ? trim($data['avatar']) : '';
-        if (strpos($avatar, "temp")) {
-            $data['avatar'] = save_image($avatar, 'user');
-        } else {
-            $data['avatar'] = str_replace(IMG_URL, "", $data['avatar']);
+        if ($avatar) {
+            $data['avatar'] = get_image_path($avatar);
         }
         $error  = "";
         $result = $this->model->edit($data, $error);
@@ -121,6 +150,7 @@ class UserService extends BaseService
         $userRoleService = new UserRoleService();
         $userRoleService->deleteUserRole($result);
         // 插入用户角色关系数据
+
         $userRoleService->insertUserRole($result, $data['role_ids']);
         return message();
     }
@@ -288,4 +318,14 @@ class UserService extends BaseService
         return message("操作成功", true, $list);
     }
 
+    /**
+     * 删除
+     * @return array
+     */
+    public function delete()
+    {
+        $this->model->where('update_time','<=',time() - 7200)->where(['mark'=>0])->delete();
+        return parent::delete(); // TODO: Change the autogenerated stub
+    }
+
 }