2
0

2 Commits fda7c2d48b ... 4c46b6b81a

Autor SHA1 Mensaje Fecha
  junghwi 4c46b6b81a asa hace 6 años
  junghwi 218831645f asa hace 6 años
Se han modificado 3 ficheros con 80 adiciones y 1 borrados
  1. 18 0
      app/Http/Controllers/Api/NoticeController.php
  2. 1 0
      composer.json
  3. 61 1
      composer.lock

+ 18 - 0
app/Http/Controllers/Api/NoticeController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Redis;
 use App\Models;
 class NoticeController extends Controller
 {
@@ -18,4 +19,21 @@ class NoticeController extends Controller
         }
         return toJson(1,'',$data);
     }
+
+    /*
+   * 添加系统公告
+   */
+    public function redisNotice(array $msg){
+        foreach($msg as $k => $v){
+            Redis::rpush('msg',$v);
+        }
+    }
+    /*
+    * 获取后删除系统公告
+    */
+    public function redisPop(){
+        $msg = Redis::lrange('msg',0,-1);
+        Redis::ltrim('msg',1,0);
+        return toJson(1,'',$msg);
+    }
 }

+ 1 - 0
composer.json

@@ -12,6 +12,7 @@
         "laravel/tinker": "~1.0",
         "mews/captcha": "^2.2",
         "orangehill/iseed": "^2.6",
+        "predis/predis": "^1.1",
         "simplesoftwareio/simple-qrcode": "^2.0",
         "spatie/laravel-permission": "^2.12",
         "stevenyangecho/laravel-u-editor": "^1.4",

+ 61 - 1
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "10c55cd0c4fc711e8afeeeeeee7580e3",
+    "content-hash": "3dc19ce0f64f36befc7c2bdd5ada1fa0",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -449,7 +449,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
                 "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "doctrine/lexer": "^1.0.1",
@@ -1147,7 +1157,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
                 "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-mbstring": "*",
@@ -1202,7 +1222,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391",
                 "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-fileinfo": "*",
@@ -1596,7 +1626,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
                 "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-tokenizer": "*",
@@ -1751,7 +1791,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
                 "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "php": ">=5.3.9"
@@ -3761,7 +3811,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
                 "reference": "13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
+<<<<<<< HEAD
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://dl.laravel-china.org/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+=======
                 "shasum": ""
+>>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "illuminate/auth": "^5.1",