Skip to content

W
workbiu-admin
Commit 9974939e authored by gxx's avatar gxx
Browse files
Options

团队中邀请成员

parent 8acacd3f
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 205 deletions
app/Http/Controllers/AuthController.php deleted 100644 → 0
View file @ 8acacd3f
<?php
namespace App\Http\Controllers;
use App\Models\Role;
use App\Models\User;
use App\Util\Message;
use Illuminate\Http\Request;
class AuthController extends Controller
{
public function add()
{
// $result =false;
// try{
// $owner = new Role();
// $owner->name = '第10权限';
// $owner->display_name = '这是最最最最厉害的3权限';
// $owner->description = 'heihh';
// $owner->save();
// $result = true;
// }catch (\Exception $e){
// // 生成日志；
// }
// if ($result){
// return Message::makeSuccess('6666');
// }
// return Message::makeError('2333333');
//
// $user = User::where('id','=','2')->first();
//
// $user->attachRole('1');
//
// dd($user);
}
public function getAll()
{
$roles = Role::paginate(6);
return view('admin/auth/authtables',compact('roles'));
}
}
app/Http/Controllers/GroupController.php
View file @ 9974939e
......@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Contracts\GroupServiceContract;
use App\Contracts\UserServiceContract;
use App\Util\Message;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
......@@ -12,9 +13,10 @@ class GroupController extends Controller
public $mGroup;
public function __construct(GroupServiceContract $group)
public function __construct(GroupServiceContract $group, UserServiceContract $user )
{
$this->mGroup = $group;
$this->mUser = $user;
}
......@@ -167,9 +169,14 @@ class GroupController extends Controller
public function simpleSearchUser($phone)
public function simpleSearchUser($search)
{
$users = $this->mUser->simpleSearch($search,$page=8);
if ($users->isEmpty()){
return null;
}
return $users;
// return Message::makeSuccess($users);
}
......
app/Providers/AuthServiceProvider.php deleted 100644 → 0
View file @ 8acacd3f
<?php
namespace App\Providers;
use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
{
/**
* The policy mappings for the application.
*
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
];
/**
* Register any authentication / authorization services.
*
* @return void
*/
public function boot()
{
$this->registerPolicies();
//
}
}
app/Services/AuthService.php deleted 100644 → 0
View file @ 8acacd3f
<?php
/**
* Created by PhpStorm.
* User: mirzat
* Date: 2017/9/18
* Time: 19:08
*/
namespace App\Services;
use App\Contracts\AuthServiceContract;
use App\Models\User;
use App\Util\Message;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Session;
class AuthService implements AuthServiceContract
{
private $user;
public function register($phone,$password,$user_name,$gender)
{
$user = new User();
$user->user_name = $user_name;
$user->phone = $phone;
$user->password = bcrypt($password);
$user->gender = $gender;
try{
$user->save();
return Message::makeSuccess($user);
}catch (QueryException $ex){
//1062 MySQL 错误代码
return Message::makeError($ex->getMessage());
}
}
public function loginWithPhone($phone, $password)
{
$user= User::where("phone",$phone)->first();
if($user!=null){
if(Hash::check($password,$user->password)){
$this->setUser($user);
return Message::makeSuccess($user);
}else{
return Message::makeError("password not valid");
}
}else{
return Message::makeError("user not found");
}
}
public function loginWithEmail($email,$password){
$user= User::where("email",$email)->first();
if($user!=null){
if(Hash::check($password,$user->password)){
$this->setUser($user);
return Message::makeSuccess($user);
}else{
return Message::makeError("password not valid");
}
}else{
return Message::makeError("user not found");
}
}
public function login(User $user){
if($user->phone){
return $this->loginWithPhone($user->phone,$user->password);
}else if($user->email){
return $this->loginWithEmail($user->email,$user->password);
}else{
return Message::makeError("empty user module");
}
}
public function checkLogin()
{
if($this->getUser()){
return true;
}else{
return false;
}
}
public function logout()
{
Session::forget("user");
}
/**
* @return mixed
*/
public function getUser()
{
$user = session()->get("user");
return $user;
}
/**
* @param mixed $user
*/
public function setUser(User $user)
{
$this->user = $user;
\session(["user"=>$user]);
}
}
\ No newline at end of file
app/Services/UserService.php
View file @ 9974939e
......@@ -25,6 +25,7 @@ class UserService implements UserServiceContract
->orWhere('phone','like','%'.$search_content.'%')
->orWhere('email','like','%'.$search_content.'%')
->paginate($page);
return $users;
}
......
config/app.php
View file @ 9974939e
......@@ -172,7 +172,6 @@ return [
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
......
resources/views/admin/group/groupinformation.blade.php
View file @ 9974939e
......@@ -69,21 +69,48 @@
</div>
<div style="margin-left: 18%;">
<form action="{{url('group/search')}}">
{{--<form action="{{url('group/search_user')}}">--}}
<div class="row">
<div class="col-lg-6">
<div class="input-group">
<input type="text" class="form-control" placeholder="手机号码" name="search" style=" width: 600px;">
<div class="input-group" id="group">
<input type="text" class="form-control" placeholder="用户名、手机号码、邮箱" id="search" style=" width: 600px;">
<span class="input-group-btn">
<button class="btn btn-default" > 搜索 </button>
<button class="btn btn-default" id="button-search"> 搜索 </button>
</span>
</div><!-- /input-group -->
</div><!-- /.col-lg-6 -->
</div><!-- /.row -->
</form>
{{--</form>--}}
</div>
@else
<script src="{{url('js/jquery-3.2.1.min.js')}}"> </script>
<script>
var a = $('#button-search').click(function () {
var search = $('#search').val();
$.ajax({
type:'get',
url:'{{url('group/search_user')}}/' + search ,
success:function(data){
if(data){
console.log(data['data'][0]);
$('#activity').append(
" <div style='margin-left: 18%;background-color: yellow;width: 655px;margin-top: 5px;'> <p style='width: 200px; height: 34px; width: 600px;float: left;line-height: 34px;border: 1px solid #D2D6DE;'>" + data['data'][0]['user_name'] + "</p> <a class='btn btn-info' style='float: left'> 邀请 </a> </div>");
}
},
error:function(data){
console.log('错误');
}
})
})
</script>
@else
@foreach($groups->usergroup as $user)
<div style="float: left;margin-left: 50px;">
......@@ -263,4 +290,12 @@
</section>
@endsection
\ No newline at end of file
@endsection
routes/web.php
View file @ 9974939e
......@@ -62,6 +62,9 @@ Route::group(['prefix'=> 'group'],function (){
Route::post('transfer','GroupController@transfer')->name('group.transfer');
Route::get('search','GroupController@simpleSearch')->name('group.search');
Route::get('search_user/{search}','GroupController@simpleSearchUser')->name('group.simpleSearchUser');
});
// 项目
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment