Qsnh · Qsnh · Feb 11, 2020 · Feb 8, 2020 · Feb 8, 2020 · Feb 8, 2020
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="public/images/meedu.jpg"/></p>
+<p align="center"><img src="public/images/meedu.png"/></p>
 
 <p align="center">
 <a href="https://github.styleci.io/repos/127536154"><img src="https://github.styleci.io/repos/127536154/shield?branch=master" alt="StyleCI"></a>

diff --git a/app/Console/Commands/AutoGenerateCommand.php b/app/Console/Commands/AutoGenerateCommand.php
diff --git a/app/Console/Commands/SwitchTemplateCommand.php b/app/Console/Commands/SwitchTemplateCommand.php
@@ -48,10 +48,14 @@ public function __construct()
     public function handle()
     {
         $template = $this->argument('template');
-        $path = base_path('templates/' . $template);
-        if (!is_dir($path)) {
-            $this->warn('模板不存在');
-            return;
+        if ($template == 'default') {
+            $path = resource_path('views');
+        } else {
+            $path = base_path('templates/' . $template);
+            if (!is_dir($path)) {
+                $this->warn('模板不存在');
+                return;
+            }
         }
         $config = [];
         $config['meedu.system.theme.use'] = $template;

diff --git a/app/Console/Commands/TemplatePublicLinkCommand.php b/app/Console/Commands/TemplatePublicLinkCommand.php
@@ -48,10 +48,6 @@ public function __construct()
     public function handle()
     {
         $template = $this->argument('template');
-        if (!$template) {
-            $this->error('请指定template');
-            return;
-        }
 
         $path = base_path('templates/' . $template . '/public');
         if (!is_dir($path)) {

diff --git a/app/Constant/ApiV2Constant.php b/app/Constant/ApiV2Constant.php
@@ -22,6 +22,8 @@ class ApiV2Constant
     const MOBILE_OR_PASSWORD_ERROR = 'mobile not exists or password error';
     const MOBILE_CODE_ERROR = 'mobile code error';
 
+    const MEMBER_HAS_LOCKED = 'current user was locked,please contact administrator';
+
     const VIDEO_NO_AUTH = 'please buy this video before see';
 
     const SMS_CODE_EXPIRE = 60;

diff --git a/app/Constant/FrontendConstant.php b/app/Constant/FrontendConstant.php
@@ -36,4 +36,12 @@ class FrontendConstant
 
     const INVITE_BALANCE_WITHDRAW_STATUS_SUCCESS = 1;
     const INVITE_BALANCE_WITHDRAW_STATUS_FAILURE = 2;
+
+    const LOGIN_CALLBACK_URL_KEY = 'login_callback_url';
+
+    const LOGIN_REFERER_BLACKLIST = [
+        '/register',
+        '/password/reset',
+        ''
+    ];
 }
diff --git a/app/Http/Controllers/Api/V2/LoginController.php b/app/Http/Controllers/Api/V2/LoginController.php
@@ -13,6 +13,7 @@
 
 use Illuminate\Support\Str;
 use App\Constant\ApiV2Constant;
+use App\Constant\FrontendConstant;
 use App\Exceptions\ApiV2Exception;
 use Illuminate\Support\Facades\Auth;
 use App\Services\Member\Services\UserService;
@@ -70,6 +71,9 @@ public function passwordLogin(PasswordLoginRequest $request)
         if (!$user) {
             return $this->error(__(ApiV2Constant::MOBILE_OR_PASSWORD_ERROR));
         }
+        if ($user['is_lock'] == FrontendConstant::YES) {
+            return $this->error(__(ApiV2Constant::MEMBER_HAS_LOCKED));
+        }
         $token = Auth::guard($this->guard)->tokenById($user['id']);
 
         return $this->data(compact('token'));
@@ -109,6 +113,9 @@ public function mobileLogin(MobileLoginRequest $request)
             // 直接注册
             $user = $this->userService->createWithMobile($mobile, Str::random(6), Str::random(3) . '_' . $mobile);
         }
+        if ($user['is_lock'] == FrontendConstant::YES) {
+            return $this->error(__(ApiV2Constant::MEMBER_HAS_LOCKED));
+        }
         $token = Auth::guard($this->guard)->tokenById($user['id']);
 
         return $this->data(compact('token'));

diff --git a/app/Http/Controllers/Backend/Api/V1/CourseController.php b/app/Http/Controllers/Backend/Api/V1/CourseController.php
@@ -16,14 +16,15 @@
 use App\Services\Course\Models\Video;
 use App\Services\Course\Models\Course;
 use App\Http\Requests\Backend\CourseRequest;
+use App\Services\Course\Models\CourseCategory;
 
 class CourseController extends BaseController
 {
     public function index(Request $request)
     {
         $keywords = $request->input('keywords', '');
         $courses = Course::when($keywords, function ($query) use ($keywords) {
-            return $query->where('title', 'like', '%'.$keywords.'%');
+            return $query->where('title', 'like', '%' . $keywords . '%');
         })
             ->orderByDesc('created_at')
             ->paginate(12);
@@ -33,6 +34,12 @@ public function index(Request $request)
         return $this->successData($courses);
     }
 
+    public function create()
+    {
+        $categories = CourseCategory::show()->get();
+        return $this->successData(compact('categories'));
+    }
+
     public function store(CourseRequest $request, Course $course)
     {
         $course->fill($request->filldata())->save();

diff --git a/app/Http/Controllers/Frontend/CourseController.php b/app/Http/Controllers/Frontend/CourseController.php
@@ -127,6 +127,10 @@ public function show($id, $slug)
     public function showBuyPage($id)
     {
         $course = $this->courseService->find($id);
+        if ($this->userService->hasCourse(Auth::id(), $id)) {
+            flash(__('You have already purchased this course'), 'success');
+            return back();
+        }
         $title = __('buy course', ['course' => $course['title']]);
 
         return v('frontend.course.buy', compact('course', 'title'));

diff --git a/app/Http/Controllers/Frontend/ForgotPasswordController.php b/app/Http/Controllers/Frontend/ForgotPasswordController.php
@@ -27,6 +27,7 @@ class ForgotPasswordController extends Controller
     public function __construct(UserServiceInterface $userService)
     {
         $this->userService = $userService;
+        $this->middleware('guest');
     }
 
     public function showPage()

diff --git a/app/Http/Controllers/Frontend/IndexController.php b/app/Http/Controllers/Frontend/IndexController.php
@@ -12,17 +12,25 @@
 namespace App\Http\Controllers\Frontend;
 
 use App\Events\AdFromEvent;
+use App\Services\Other\Services\LinkService;
 use App\Services\Base\Services\ConfigService;
 use App\Services\Other\Interfaces\LinkServiceInterface;
+use App\Services\Base\Interfaces\ConfigServiceInterface;
 
 class IndexController extends FrontendController
 {
+    /**
+     * @var LinkService
+     */
     protected $linkService;
+    /**
+         * @var ConfigService
+     */
     protected $configService;
 
     public function __construct(
         LinkServiceInterface $linkService,
-        ConfigService $configService
+        ConfigServiceInterface $configService
     ) {
         $this->linkService = $linkService;
         $this->configService = $configService;
@@ -47,4 +55,10 @@ public function index()
             compact('title', 'keywords', 'description', 'links')
         );
     }
+
+    public function userProtocol()
+    {
+        $protocol = $this->configService->getMemberProtocol();
+        return v('frontend.index.user_protocol', compact('protocol'));
+    }
 }
diff --git a/app/Http/Controllers/Frontend/LoginController.php b/app/Http/Controllers/Frontend/LoginController.php
@@ -13,6 +13,7 @@
 
 use Socialite;
 use App\Events\UserLoginEvent;
+use App\Constant\FrontendConstant;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\BaseController;
 use App\Services\Member\Services\UserService;
@@ -39,11 +40,7 @@ public function __construct(UserServiceInterface $userService, SocialiteServiceI
         $this->userService = $userService;
         $this->socialiteService = $socialiteService;
         $this->middleware('guest')->except(
-            'logout',
-            'showLoginPage',
-            'passwordLoginHandler',
-            'socialLogin',
-            'socialiteLoginCallback'
+            'logout'
         );
     }
 
@@ -52,6 +49,14 @@ public function __construct(UserServiceInterface $userService, SocialiteServiceI
      */
     public function showLoginPage()
     {
+        $previousUrl = request()->server('HTTP_REFERER') ?: url('/');
+        foreach (FrontendConstant::LOGIN_REFERER_BLACKLIST as $item) {
+            if (preg_match("#{$item}#ius", $previousUrl)) {
+                $previousUrl = url('/');
+                break;
+            }
+        }
+        session([FrontendConstant::LOGIN_CALLBACK_URL_KEY => $previousUrl]);
         return v('frontend.auth.login');
     }
 
@@ -70,11 +75,15 @@ public function passwordLoginHandler(LoginPasswordRequest $request)
             flash(__('mobile not exists or password error'), 'error');
             return back();
         }
+        if ($user['is_lock'] == FrontendConstant::YES) {
+            flash(__('current user was locked,please contact administrator'));
+            return back();
+        }
         Auth::loginUsingId($user['id'], $request->has('remember'));
 
         event(new UserLoginEvent($user['id']));
 
-        return redirect(url('/'));
+        return redirect($this->redirectTo());
     }
 
     /**
@@ -102,12 +111,17 @@ public function socialiteLoginCallback($app)
             return redirect('member');
         }
         if ($bindUserId = $this->socialiteService->getBindUserId($app, $appId)) {
-            Auth::loginUsingId($bindUserId);
-            return redirect(url('/'));
+            $userId = $bindUserId;
+        } else {
+            $userId = $this->socialiteService->bindAppWithNewUser($app, $appId, (array)$user);
+        }
+        $user = $this->userService->find($userId);
+        if ($user['is_lock'] == FrontendConstant::YES) {
+            flash(__('current user was locked,please contact administrator'));
+            return back();
         }
-        $userId = $this->socialiteService->bindAppWithNewUser($app, $appId, (array)$user);
         Auth::loginUsingId($userId, true);
-        return redirect(url('/'));
+        return redirect($this->redirectTo());
     }
 
     /**
@@ -119,4 +133,14 @@ public function logout()
         flash(__('success'), 'success');
         return redirect(url('/'));
     }
+
+    /**
+     * @return \Illuminate\Contracts\Routing\UrlGenerator|\Illuminate\Session\SessionManager|\Illuminate\Session\Store|mixed|string
+     */
+    protected function redirectTo()
+    {
+        $callbackUrl = session()->has(FrontendConstant::LOGIN_CALLBACK_URL_KEY) ?
+            session(FrontendConstant::LOGIN_CALLBACK_URL_KEY) : url('/');
+        return $callbackUrl;
+    }
 }
diff --git a/app/Http/Controllers/Frontend/RegisterController.php b/app/Http/Controllers/Frontend/RegisterController.php
@@ -27,6 +27,7 @@ class RegisterController extends BaseController
     public function __construct(UserServiceInterface $userService)
     {
         $this->userService = $userService;
+        $this->middleware('guest');
     }
 
     /**

diff --git a/app/Http/Controllers/Frontend/VideoController.php b/app/Http/Controllers/Frontend/VideoController.php
@@ -127,9 +127,13 @@ public function show($courseId, $id, $slug)
     public function showBuyPage($id)
     {
         $video = $this->videoService->find($id);
+        if ($this->userService->hasVideo(Auth::id(), $video['id'])) {
+            flash(__('You have already purchased this course'), 'success');
+            return back();
+        }
         $title = __('buy video', ['video' => $video['title']]);
 
-        return v('frontend.video.buy', compact('video', compact('title')));
+        return v('frontend.video.buy', compact('video', 'title'));
     }
 
     public function buyHandler(Request $request, $id)
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ class RegisterController extends BaseController @@
         public function __construct(UserServiceInterface $userService)
         {
             $this->userService = $userService;
+            $this->middleware('guest');
         }
         /**
@@ Expand Down @@