Mike преди 7 години
родител
ревизия
2dcb06c68a
променени са 4 файла, в които са добавени 10 реда и са изтрити 8 реда
  1. 2 1
      .gitignore
  2. 4 4
      miaomiao/www/js/config/config.js
  3. 1 1
      server/app/Http/Kernel.php
  4. 3 2
      server/app/Http/Middleware/Authenticate.php

+ 2 - 1
.gitignore

xqd
@@ -22,4 +22,5 @@ miaomiao/miaomiao/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties
 miaomiao/miaomiao/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
 
 platforms
-server/public/qrcodes
+server/public/qrcodes
+miaomiao/android-release.apk

+ 4 - 4
miaomiao/www/js/config/config.js

xqd
@@ -3,10 +3,10 @@
     app.constant("config", {
         // server: 'http://q8.9026.com/',
         // imgServer: 'http://q8.9026.com/attachment/'
-        //server: 'http://localhost:8092/',
-        //imgServer: 'http://localhost:8092/attachment/'
+        server: 'http://localhost:8092/',
+        imgServer: 'http://localhost:8092/attachment/'
 
-        server: 'http://miao.beiyuesi.com/',
-        imgServer: 'http://miao.beiyuesi.com/attachment/'
+        // server: 'http://miao.beiyuesi.com/',
+        // imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

+ 1 - 1
server/app/Http/Kernel.php

xqd
@@ -52,7 +52,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,

+ 3 - 2
server/app/Http/Middleware/Authenticate.php

xqd
@@ -18,9 +18,10 @@ class Authenticate
     public function handle($request, Closure $next, $guard = null)
     {
         if(Auth::guard($guard)->guest()) {
-            if($request->ajax()) {
+            \Log::info($guard);
+            if($request->ajax()||$guard=="api") {
                 \Log::info('Unauthorized Unauthorized ');
-                return response('Unauthorized.', 401);
+                return response('Unauthorized .', 401);
             } else {
                 if($guard == 'admin') {
                     return redirect()->guest('admin/login');