Commit 7e8ac033 authored by xiabin's avatar xiabin

添加from

parent 93389443
......@@ -76,7 +76,7 @@ class User extends ActiveRecord implements IdentityInterface
public function rules()
{
return [
[['username', 'auth_key', 'password_hash', 'telephone', 'ip', 'logged_at'], 'required'],
[['username', 'auth_key', 'password_hash', 'telephone', 'ip', 'from', 'logged_at'], 'required'],
[['role', 'status'], 'integer'],
[['created_at', 'updated_at', 'logged_at'], 'safe'],
[['username', 'auth_key', 'wx_open_id', 'ip'], 'string', 'max' => 32],
......@@ -106,6 +106,7 @@ class User extends ActiveRecord implements IdentityInterface
'avatar' => 'avatar',
'wx_open_id' => 'wx_open_id',
'ip' => 'ip',
'from' => 'from',
'created_at' => 'created_at',
'updated_at' => 'updated_at',
'logged_at' => 'logged_at',
......@@ -177,22 +178,22 @@ class User extends ActiveRecord implements IdentityInterface
/**
* 获取用户头像 URL
*
*
* @param string $avatar
* @param string $size 头像尺寸,目前仅支持 m,留空返回原图
* @return string
*/
public static function getAvatarUrl($avatar, $size='m')
public static function getAvatarUrl($avatar, $size = 'm')
{
if (!$avatar) {
return \frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png') ;
return \frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png');
}
$url = Yii::$app->qiniu->getUrl('public', $avatar);
return $size ? $url."-{$size}.avatar" : $url;
return $size ? $url . "-{$size}.avatar" : $url;
}
/**
* @inheritdoc
*/
......
......@@ -26,6 +26,7 @@ class m160927_104153_users_init extends Migration
'avatar' => $this->string(128)->notNull()->defaultValue(''),
'wx_open_id' => $this->string(32)->defaultValue('')->comment('登录微信id'),
'ip' => $this->string(32)->notNull(),
'from' => $this->init()->unsigned()->defaultValue(0)->comment('0 来自注册 其它为某个user_id'),
'created_at' => $this->integer()->notNull(),
'updated_at' => $this->integer()->notNull(),
'logged_at' => $this->integer()->notNull()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment