Merge branch 'master' of http://svn.ouj.com:3000/eos_sicbo/chat

protected/models/Account.php

@@ -24,10 +24,10 @@ class Account extends Model {
 
     private static $arrType = [
         self::TYPE_EOS => 'EOS',
+        self::TYPE_MEETONE => 'MEETONE',
+        self::TYPE_TG => 'TG',
         self::TYPE_ETH => 'ETH',
         self::TYPE_TRON => 'TRON',
-        self::TYPE_TG => 'TG',
-        self::TYPE_MEETONE => 'MEETONE',
     ];
 
     public static function getAllType() {

protected/models/Redpack.php

@@ -249,7 +249,7 @@ class Redpack extends Model {
             throw new Exception('log error', CODE_NORMAL_ERROR);
         }
 
-        $from = $objUserBindInfo->getUserIdBy($row['sender'], 'eos');
+        $from = $objUserBindInfo->getUserIdBy($row['sender'], $accountType);
         $eventData = [
             'type' => 'grab_redpack',
             'from' => (int) $from,

protected/models/User.php

@@ -309,6 +309,7 @@ class User extends Singleton {
             $binds[] = $item;
         }
         $userInfo['binds'] = $binds;
+        $userInfo['cover_photo'] = awsReplaceImg($userInfo['cover_photo']);
 
         return $userInfo ?: [];
     }