Merge pull request #18 from windhoney/develop

user表多余字段删除，添加realname字段

Author: windhoney

README.md

@@ -67,8 +67,10 @@ yii migrate --migrationPath=@vendor/windhoney/yii2-rest-rbac/migrations
 ```php
 yii migrate --migrationPath=@yii/rbac/migrations/
 ```
->> `auth_item` 表添加一个字段 `parent_name` varchar(30) COLLATE utf8_unicode_ci DEFAULT '' COMMENT '父级名称',
-> ###### 3. oauth2相关表
+
+> **_**`auth_item` 表添加一个字段 `parent_name` varchar(30) COLLATE utf8_unicode_ci DEFAULT '' COMMENT '父级名称'**_**,
+###### 3. oauth2相关表
+
 ```php
 yii migrate --migrationPath=@vendor/filsh/yii2-oauth2-server/migrations
 ```

migrations/m160312_050000_create_user.php

@@ -21,6 +21,7 @@ public function up()
             $this->createTable($userTable, [
                 'id' => $this->primaryKey(),
                 'username' => $this->string(32)->notNull(),
+                'realname' => $this->string(100)->notNull(),
                 'auth_key' => $this->string(32)->notNull(),
                 'password_hash' => $this->string()->notNull(),
                 'password_reset_token' => $this->string(),

models/searchs/User.php

@@ -55,16 +55,13 @@ public function search($params)
             "role",
             "status",
             "created_at",
-//            "updated_at",
-            "store_id",
-//            "dingId"
         ]);
         $query->andFilterWhere(['like', 'username', $this->username])
             ->andFilterWhere(['like', 'auth_key', $this->auth_key])
             ->andFilterWhere(['like', 'password_hash', $this->password_hash])
             ->andFilterWhere(['like', 'password_reset_token', $this->password_reset_token])
             ->andFilterWhere(['like', 'email', $this->email]);
-        $query->andWhere(['status' => 10]);
+        $query->andWhere(['status' => parent::STATUS_ACTIVE]);
         $query->orderBy(['id' => 'asc']);
         $result = $query->asArray()->all();
         foreach ($result as $key => $value) {
@@ -82,7 +79,7 @@ public function allUsers($select = '*')
     {
         $query = UserModel::find();
         $query->select($select);
-        $query->andWhere(['status' => 10]);
+        $query->andWhere(['status' => parent::STATUS_ACTIVE]);
         $result = $query->asArray()->all();
 
         return $result;