合并冲突

backend/controllers/v1/BaseController.php

@@ -44,7 +44,7 @@ class BaseController extends ActiveController
                     'Access-Control-Request-Method' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'],
                     'Access-Control-Request-Headers' => ['*'],
                     'Access-Control-Allow-Credentials' => true,
-                    'Access-Control-Max-Age' => 86400,
+                    'Access-Control-Max-Age' => 3600,
                     'Access-Control-Expose-Headers' => ['*'],
                 ],
             ]

backend/models/v1/user/LoginForm.php

@@ -4,6 +4,7 @@ namespace backend\models\v1\user;
 use Yii;
 use yii\base\Model;
 use app\models\v1\user\ShopRbacUser;
+use yii\web\HttpException;
 
 /**
  * Login form
@@ -56,11 +57,11 @@ class LoginForm extends Model
         if ($this->validate()) {
             $accessToken=$this->_shopRbacUser->generateAccessToken();
             // 生成的access_token保存一份到mysql和redis中
-            var_dump($this->_shopRbacUser);exit;
-            $this->_shopRbacUser->save();
-            return $accessToken;
+            if ($this->_shopRbacUser->save()) {
+                return $accessToken;
+            }
+           throw new HttpException('400','登陆失败');
         }
-        
         return false;
     }
 

backend/models/v1/user/ShopRbacUser.php

@@ -25,10 +25,10 @@ use yii\web\IdentityInterface;
  * @property int $CONTACTSEX 性别，1：男，0：女
  * @property string $DESCRIPTION 用户头像URL
  * @property string $USER_GUID 大平台USERGUID,普通用户此信息为空
- * @property string $IS_UPLOAD_HX 是否上传华信，1：是
+ * @property int $IS_UPLOAD_HX 是否上传华信，1：是
  * @property int $IS_BELONG 是否员工，1：是
  * @property string $REMARK 备注
- * @property string $ALIPAY_UID 是否员工，1：是
+ * @property string $ALIPAY_UID 阿里payid
  * @property string $WX_UNIONID 小程序UNIONID
  * @property string $WX_OPENID 小程序OPENID
  * @property int $AGE 年龄
@@ -51,14 +51,12 @@ class ShopRbacUser extends  ActiveRecord implements IdentityInterface
     public function rules()
     {
         return [
-            [['GUID', 'CODE'], 'required','message' =>'账号密码不能为空'],
+            [['GUID', 'CODE'], 'required'],
             [['CREATE_DATE', 'UPDATE_DATE'], 'safe'],
-            [['IS_FORBID', 'CONTACTSEX', 'IS_BELONG', 'AGE'], 'integer'],
-            [['GUID', 'CODE', 'PASSWORD', 'ORG_GUID', 'EMPLOYEE_GUID', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILEPHONE', 'USER_GUID', 'REMARK', 'ALIPAY_UID', 'WX_UNIONID', 'WX_OPENID', 'SHARE_NO'], 'string', 'max' => 50],
-            [['PASSWORD'],'required','message' =>'账号密码不能为空'],
+            [['IS_FORBID', 'CONTACTSEX', 'IS_UPLOAD_HX', 'IS_BELONG', 'AGE'], 'integer'],
+            [['GUID', 'CODE', 'PASSWORD', 'ORG_GUID', 'EMPLOYEE_GUID', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILEPHONE', 'USER_GUID', 'REMARK', 'ALIPAY_UID', 'WX_UNIONID', 'WX_OPENID', 'SHARE_NO', 'ACCESS_TOKEN'], 'string', 'max' => 50],
             [['NAME', 'CREATE_NAME', 'UPDATE_NAME'], 'string', 'max' => 100],
             [['DESCRIPTION'], 'string', 'max' => 255],
-            [['IS_UPLOAD_HX'], 'string', 'max' => 10],
             [['GUID'], 'unique'],
         ];
     }
@@ -94,6 +92,7 @@ class ShopRbacUser extends  ActiveRecord implements IdentityInterface
             'WX_OPENID' => 'Wx Openid',
             'AGE' => 'Age',
             'SHARE_NO' => 'Share No',
+            'ACCESS_TOKEN' => 'Access Token',
         ];
     }
     /**