Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -186,10 +186,10 @@ class LoginController extends BaseController
             $resMessage = $data['message'];
             $resMessage = $data['message'];
         }elseif($data['code'] == 1){
         }elseif($data['code'] == 1){
             $resMessage = $data['message'];
             $resMessage = $data['message'];
-            $info = $data['data'];
-            Cache::add($arrayData['Ticket'],$info,300);
+            Cache::add($arrayData['Ticket'],$data,300);
         }else{
         }else{
             $resMessage = $data['message'];
             $resMessage = $data['message'];
+            Cache::add($arrayData['Ticket'],$data,300);
         }
         }
         return "<xml>
         return "<xml>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>

@@ -257,10 +257,7 @@ class UserLoginLogic
                 'message'=>'当前微信已绑定其他微信，请解绑后再操作',
                 'message'=>'当前微信已绑定其他微信，请解绑后再操作',
             ];
             ];
         }else{
         }else{
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($id, true) . PHP_EOL, FILE_APPEND);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($wechat, true) . PHP_EOL, FILE_APPEND);
-            $rs = $this->model->edit(['wechat'=>$wechat],['id'=>(int)$id]);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($rs, true) . PHP_EOL, FILE_APPEND);
+            $this->model->edit(['wechat'=>$wechat],['id'=>(int)$id]);
             $data = [
             $data = [
                 'code'=>2,
                 'code'=>2,
                 'message'=>'绑定成功',
                 'message'=>'绑定成功',

@@ -18,26 +18,6 @@ class User extends Base
     protected $table = 'gl_project_user';
     protected $table = 'gl_project_user';
     //自动维护create_at创建时间 updated_at修改时间
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
     public $timestamps = true;
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-//        'name',
-        'email',
-        'password',
-    ];
-
-    /**
-     * The attributes that should be hidden for serialization.
-     *
-     * @var array<int, string>
-     */
-    protected $hidden = [
-//        'password',
-        'remember_token',
-    ];
 
 
     /**
     /**
      * The attributes that should be cast.
      * The attributes that should be cast.