Merge branch 'master' into develop

@@ -46,20 +46,20 @@ class IndexController extends BaseController
      */
      */
     public function editPassword(){
     public function editPassword(){
         $this->request->validate([
         $this->request->validate([
-            'oldPassword'=>'required',
+//            'oldPassword'=>'required',
             'password' => 'required',
             'password' => 'required',
             'confirm'=>'required',
             'confirm'=>'required',
         ], [
         ], [
-            'oldPassword.required' => '请输入原密码',
+//            'oldPassword.required' => '请输入原密码',
             'password.required' => '请输入新密码',
             'password.required' => '请输入新密码',
             'confirm.required' => '请再次输入新密码',
             'confirm.required' => '请再次输入新密码',
         ]);
         ]);
         //查询员密码是否正确
         //查询员密码是否正确
         $managerModel = new Manage();
         $managerModel = new Manage();
         $info = $managerModel->read(['id'=>$this->manage['id']]);
         $info = $managerModel->read(['id'=>$this->manage['id']]);
-        if(!Hash::check($this->param['oldPassword'], $info['password'])){
-            $this->response('原密码错误',Code::USER_REGISTER_ERROE);
-        }
+//        if(!Hash::check($this->param['oldPassword'], $info['password'])){
+//            $this->response('原密码错误',Code::USER_REGISTER_ERROE);
+//        }
         if($this->param['password'] != $this->param['confirm']){
         if($this->param['password'] != $this->param['confirm']){
             $this->response('两次密码不一致');
             $this->response('两次密码不一致');
         }
         }

@@ -126,20 +126,20 @@ class ComController extends BaseController
      */
      */
     public function edit_info(){
     public function edit_info(){
             $this->request->validate([
             $this->request->validate([
-                'oldPassword'=>'required',
+//                'oldPassword'=>'required',
                 'password' => 'required',
                 'password' => 'required',
                 'confirm'=>'required',
                 'confirm'=>'required',
             ], [
             ], [
-                'oldPassword.required' => '请输入原密码',
+//                'oldPassword.required' => '请输入原密码',
                 'password.required' => '请输入新密码',
                 'password.required' => '请输入新密码',
                 'confirm.required' => '请再次输入新密码',
                 'confirm.required' => '请再次输入新密码',
             ]);
             ]);
             //查询员密码是否正确
             //查询员密码是否正确
             $userModel = new User();
             $userModel = new User();
             $info = $userModel->read(['id'=>$this->user['id']]);
             $info = $userModel->read(['id'=>$this->user['id']]);
-            if($info['password'] != base64_encode(md5($this->param['oldPassword']))){
-                $this->response('原密码错误',Code::USER_ERROR);
-            }
+//            if($info['password'] != base64_encode(md5($this->param['oldPassword']))){
+//                $this->response('原密码错误',Code::USER_ERROR);
+//            }
             if($this->param['password'] != $this->param['confirm']){
             if($this->param['password'] != $this->param['confirm']){
                 $this->response('两次密码不一致');
                 $this->response('两次密码不一致');
             }
             }