Merge branch 'test' into 'master'

Test

See merge request !28

app/Helpers/functions.php

@@ -297,6 +297,8 @@ function generateRandomNum( $len = 32, $md5 = true ) {
     # Create random token at the specified length
     for ( $i=0; $i<$len; $i++ )
         $token .= $chars[ mt_rand(0, $numChars) ];
+
+    $time = microtime(true);
     # Should token be run through md5?
     if ( $md5 ) {
         # Number of 32 char chunks
@@ -305,8 +307,9 @@ function generateRandomNum( $len = 32, $md5 = true ) {
         for ( $i=1; $i<=$chunks; $i++ )
             $md5token .= md5( substr($token, $i * 32 - 32, 32) );
         # Trim the token
-        $token = substr($md5token, 0, $len);
+        $token = md5($time.substr($md5token, 0, $len));
     }
+
     return $token;
 }
 

app/Http/Controllers/Api/MediaController.php

@@ -177,7 +177,7 @@ class MediaController extends Controller
 
 
             $params = array(
-                'media_id'  => 'mda-'.generateRandomNum(16),
+                'media_id'  => MediaModel::getMediaId(),
                 'media_type'=> '5efa9cb5d16f5a214671fd86',//默认，中公网校
                 'start_time'=> $data_time,
                 'end_time'  => $data_time,

app/Model/MediaModel.php

@@ -801,7 +801,32 @@ class MediaModel extends Eloquent
 
     }
 
+    /**
+     * @return string
+     * @throws DatabaseException
+     */
+    public static function getMediaId(){
+
+        try{
+            $i = 0;
+            do {
+                $media_id = "mda-".generateRandomNum(16);
+                $media = MediaModel::find($media_id);
+                $i ++;
+
+            } while ($i < 3 && !empty($media) );
 
 
+            if ($i == 3){
+                throw new \Exception('获取媒资编号失败');
+            }
+
+        }catch (\Exception $exception){
+            throw new DatabaseException($exception->getMessage());
+        }
+
+        return $media_id;
+    }
+
 
 }